@@ -75,7 +75,6 @@ typedef zend_result (*mysqli_read_t)(mysqli_object *obj, zval *rv, bool quiet);
7575typedef zend_result (* mysqli_write_t )(mysqli_object * obj , zval * newval );
7676
7777typedef struct _mysqli_prop_handler {
78- zend_string * name ;
7978 mysqli_read_t read_func ;
8079 mysqli_write_t write_func ;
8180} mysqli_prop_handler ;
@@ -294,11 +293,11 @@ zval *mysqli_write_property(zend_object *object, zend_string *name, zval *value,
294293void mysqli_add_property (HashTable * h , const char * pname , size_t pname_len , mysqli_read_t r_func , mysqli_write_t w_func ) {
295294 mysqli_prop_handler p ;
296295
297- p . name = zend_string_init_interned (pname , pname_len , 1 );
296+ zend_string * name = zend_string_init_interned (pname , pname_len , 1 );
298297 p .read_func = (r_func ) ? r_func : mysqli_read_na ;
299298 p .write_func = w_func ;
300- zend_hash_add_mem (h , p . name , & p , sizeof (mysqli_prop_handler ));
301- zend_string_release_ex (p . name , 1 );
299+ zend_hash_add_mem (h , name , & p , sizeof (mysqli_prop_handler ));
300+ zend_string_release_ex (name , 1 );
302301}
303302/* }}} */
304303
@@ -344,17 +343,17 @@ HashTable *mysqli_object_get_debug_info(zend_object *object, int *is_temp)
344343{
345344 mysqli_object * obj = php_mysqli_fetch_object (object );
346345 HashTable * retval , * props = obj -> prop_handler ;
347- mysqli_prop_handler * entry ;
346+ zend_string * name ;
348347
349348 retval = zend_new_array (zend_hash_num_elements (props ) + 1 );
350349
351- ZEND_HASH_MAP_FOREACH_PTR (props , entry ) {
350+ ZEND_HASH_MAP_FOREACH_STR_KEY (props , name ) {
352351 zval rv ;
353352 zval * value ;
354353
355- value = mysqli_read_property (object , entry -> name , BP_VAR_IS , 0 , & rv );
354+ value = mysqli_read_property (object , name , BP_VAR_IS , 0 , & rv );
356355 if (value != & EG (uninitialized_zval )) {
357- zend_hash_add (retval , entry -> name , value );
356+ zend_hash_add (retval , name , value );
358357 }
359358 } ZEND_HASH_FOREACH_END ();
360359
0 commit comments