pajoye Sat, 05 Sep 2009 19:00:05 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288088
Log:
- don't hide early declaration
Changed paths:
U php/php-src/branches/PHP_5_2/Zend/zend_API.c
U php/php-src/branches/PHP_5_3/Zend/zend_API.c
U php/php-src/trunk/Zend/zend_API.c
Modified: php/php-src/branches/PHP_5_2/Zend/zend_API.c
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend_API.c 2009-09-05 18:22:16 UTC
(rev 288087)
+++ php/php-src/branches/PHP_5_2/Zend/zend_API.c 2009-09-05 19:00:05 UTC
(rev 288088)
@@ -909,13 +909,13 @@
(*q)->is_ref = 1;
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&q,
sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&r,
sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(&class_type->default_static_members, &pos);
}
Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_API.c 2009-09-05 18:22:16 UTC
(rev 288087)
+++ php/php-src/branches/PHP_5_3/Zend/zend_API.c 2009-09-05 19:00:05 UTC
(rev 288088)
@@ -1038,13 +1038,13 @@
Z_SET_ISREF_PP(q);
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&q,
sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&r,
sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(&class_type->default_static_members, &pos);
}
Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c 2009-09-05 18:22:16 UTC (rev 288087)
+++ php/php-src/trunk/Zend/zend_API.c 2009-09-05 19:00:05 UTC (rev 288088)
@@ -1320,13 +1320,13 @@
Z_SET_ISREF_PP(q);
zend_u_hash_add(CE_STATIC_MEMBERS(class_type), utype, str_index, str_length,
(void**)q, sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_u_hash_add(CE_STATIC_MEMBERS(class_type), utype, str_index, str_length,
(void**)&q, sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_u_hash_add(CE_STATIC_MEMBERS(class_type), utype, str_index, str_length,
(void**)&r, sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(&class_type->default_static_members, &pos);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
