]> granicus.if.org Git - php/commitdiff
- local redeclaration
authorPierre Joye <pajoye@php.net>
Mon, 10 Jan 2011 01:04:36 +0000 (01:04 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 10 Jan 2011 01:04:36 +0000 (01:04 +0000)
win32/registry.c

index 77089ba6a72f237b6a5fb59267ce46eba789e26e..35b411f4ce511af5c611ae7fdecee6f66c1cb5af 100644 (file)
@@ -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);
                                                }
                                        }
                                }