diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-12-07 19:24:55 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-12-07 19:24:55 +0300 |
| commit | 6a9d2b2190923bfbc7b7caa1462ba95965a1b991 (patch) | |
| tree | 26d1695b07a29a873e5fcd74cd4af47c89454f78 /ext/zip/php_zip.c | |
| parent | c890d469fab27500f0fa1070dccb16b36aa8be76 (diff) | |
| download | php-git-6a9d2b2190923bfbc7b7caa1462ba95965a1b991.tar.gz | |
Cleanup type conversion
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index c20a059467..926aaae7e2 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -881,8 +881,7 @@ static zval *php_zip_get_property_ptr_ptr(zval *object, zval *member, int type, zend_object_handlers *std_hnd; if (Z_TYPE_P(member) != IS_STRING) { - ZVAL_COPY(&tmp_member, member); - convert_to_string(&tmp_member); + ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; } @@ -915,8 +914,7 @@ static zval *php_zip_read_property(zval *object, zval *member, int type, void ** zend_object_handlers *std_hnd; if (Z_TYPE_P(member) != IS_STRING) { - ZVAL_COPY(&tmp_member, member); - convert_to_string(&tmp_member); + ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; } @@ -954,8 +952,7 @@ static int php_zip_has_property(zval *object, zval *member, int type, void **cac int retval = 0; if (Z_TYPE_P(member) != IS_STRING) { - ZVAL_COPY(&tmp_member, member); - convert_to_string(&tmp_member); + ZVAL_STR(&tmp_member, zval_get_string_func(member)); member = &tmp_member; cache_slot = NULL; } |