summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-01-10 01:04:36 +0000
committerPierre Joye <pajoye@php.net>2011-01-10 01:04:36 +0000
commit10a1f90ab046bbca89c3cf4b8e843821b3b0260f (patch)
treed85f110e4a0286fd67a5d2fc8dedf0cd0c493ab5 /win32
parentab4ce5516d4c13480d3af7641e59394a79f4a7eb (diff)
downloadphp-git-10a1f90ab046bbca89c3cf4b8e843821b3b0260f.tar.gz
- local redeclaration
Diffstat (limited to 'win32')
-rw-r--r--win32/registry.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/registry.c b/win32/registry.c
index 77089ba6a7..35b411f4ce 100644
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -95,14 +95,14 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_
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);
}
}
}