From 2ed8a170456c085491670a9beb62d4a6cac0903b Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 7 Jul 2014 20:54:31 +0400 Subject: Refactored run_time_cache usage in object handlers --- ext/zip/php_zip.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/zip/php_zip.c') diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index e73d9c095c..633644e4e9 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -829,7 +829,7 @@ static zval *php_zip_property_reader(ze_zip_object *obj, zip_prop_handler *hnd, } /* }}} */ -static zval *php_zip_get_property_ptr_ptr(zval *object, zval *member, int type, zend_uint cache_slot TSRMLS_DC) /* {{{ */ +static zval *php_zip_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot TSRMLS_DC) /* {{{ */ { ze_zip_object *obj; zval tmp_member; @@ -841,7 +841,7 @@ static zval *php_zip_get_property_ptr_ptr(zval *object, zval *member, int type, ZVAL_DUP(&tmp_member, member); convert_to_string(&tmp_member); member = &tmp_member; - cache_slot = -1; + cache_slot = NULL; } obj = Z_ZIP_P(object); @@ -863,7 +863,7 @@ static zval *php_zip_get_property_ptr_ptr(zval *object, zval *member, int type, } /* }}} */ -static zval *php_zip_read_property(zval *object, zval *member, int type, zend_uint cache_slot, zval *rv TSRMLS_DC) /* {{{ */ +static zval *php_zip_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv TSRMLS_DC) /* {{{ */ { ze_zip_object *obj; zval tmp_member; @@ -875,7 +875,7 @@ static zval *php_zip_read_property(zval *object, zval *member, int type, zend_ui ZVAL_DUP(&tmp_member, member); convert_to_string(&tmp_member); member = &tmp_member; - cache_slot = -1; + cache_slot = NULL; } obj = Z_ZIP_P(object); @@ -902,7 +902,7 @@ static zval *php_zip_read_property(zval *object, zval *member, int type, zend_ui } /* }}} */ -static int php_zip_has_property(zval *object, zval *member, int type, zend_uint cache_slot TSRMLS_DC) /* {{{ */ +static int php_zip_has_property(zval *object, zval *member, int type, void **cache_slot TSRMLS_DC) /* {{{ */ { ze_zip_object *obj; zval tmp_member; @@ -914,7 +914,7 @@ static int php_zip_has_property(zval *object, zval *member, int type, zend_uint ZVAL_DUP(&tmp_member, member); convert_to_string(&tmp_member); member = &tmp_member; - cache_slot = -1; + cache_slot = NULL; } obj = Z_ZIP_P(object); -- cgit v1.2.1