svn: /php/php-src/ branches/PHP_5_3/win32/registry.c trunk/win32/registry.c
| From: | Pierre Joye | Date: | Mon, 10 Jan 2011 01:04:36 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/win32/registry.c trunk/win32/registry.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64320@lists.php.net to get a copy of this message | ||
pajoye Mon, 10 Jan 2011 01:04:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307318
Log:
- local redeclaration
Changed paths:
U php/php-src/branches/PHP_5_3/win32/registry.c
U php/php-src/trunk/win32/registry.c
Modified: php/php-src/branches/PHP_5_3/win32/registry.c
===================================================================
--- php/php-src/branches/PHP_5_3/win32/registry.c 2011-01-10 00:59:19 UTC (rev 307317)
+++ php/php-src/branches/PHP_5_3/win32/registry.c 2011-01-10 01:04:36 UTC (rev 307318)
@@ -95,14 +95,14 @@
char *index;
uint index_len;
ulong num;
- zval **data;
+ zval **tmpdata;
for (zend_hash_internal_pointer_reset_ex(parent_ht, &pos);
- zend_hash_get_current_data_ex(parent_ht, (void**)&data, &pos) == SUCCESS
&&
+ zend_hash_get_current_data_ex(parent_ht, (void**)&tmpdata, &pos) == SUCCESS
&&
zend_hash_get_current_key_ex(parent_ht, &index, &index_len, &num, 0,
&pos) == HASH_KEY_IS_STRING;
zend_hash_move_forward_ex(parent_ht, &pos)) {
- if (zend_hash_add(ht, index, index_len, data, sizeof(zval*), NULL) == SUCCESS) {
- Z_ADDREF_PP(data);
+ if (zend_hash_add(ht, index, index_len, tmpdata, sizeof(zval*), NULL) == SUCCESS) {
+ Z_ADDREF_PP(tmpdata);
}
}
}
Modified: php/php-src/trunk/win32/registry.c
===================================================================
--- php/php-src/trunk/win32/registry.c 2011-01-10 00:59:19 UTC (rev 307317)
+++ php/php-src/trunk/win32/registry.c 2011-01-10 01:04:36 UTC (rev 307318)
@@ -95,14 +95,14 @@
char *index;
uint index_len;
ulong num;
- zval **data;
+ zval **tmpdata;
for (zend_hash_internal_pointer_reset_ex(parent_ht, &pos);
- zend_hash_get_current_data_ex(parent_ht, (void**)&data, &pos) == SUCCESS
&&
+ zend_hash_get_current_data_ex(parent_ht, (void**)&tmpdata, &pos) == SUCCESS
&&
zend_hash_get_current_key_ex(parent_ht, &index, &index_len, &num, 0,
&pos) == HASH_KEY_IS_STRING;
zend_hash_move_forward_ex(parent_ht, &pos)) {
- if (zend_hash_add(ht, index, index_len, data, sizeof(zval*), NULL) == SUCCESS) {
- Z_ADDREF_PP(data);
+ if (zend_hash_add(ht, index, index_len, tmpdata, sizeof(zval*), NULL) == SUCCESS) {
+ Z_ADDREF_PP(tmpdata);
}
}
}