php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use HashPosition iterator instead of saving/restoring internal pointer

Browse Source
This commit is contained in:
Stanislav Malyshev
2000-12-18 15:06:03 +00:00
parent 9a135a2b29
commit 63873aba37
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend.c
+6 -8
View File
@@ -79,8 +79,8 @@ static void print_hash(HashTable *ht, int indent)
{
zval **tmp;
char *string_key;
Bucket *save_internal_pointer;
unsigned long num_key;
HashPosition iterator;
unsigned long num_key, str_len;
int i;
for (i=0; i<indent; i++) {
@@ -88,14 +88,13 @@ static void print_hash(HashTable *ht, int indent)
}
ZEND_PUTS("(\n");
indent += PRINT_ZVAL_INDENT;
save_internal_pointer = ht->pInternalPointer;
zend_hash_internal_pointer_reset(ht);
while (zend_hash_get_current_data(ht, (void **) &tmp) == SUCCESS) {
zend_hash_internal_pointer_reset_ex(ht, &iterator);
while (zend_hash_get_current_data_ex(ht, (void **) &tmp, &iterator) == SUCCESS) {
for (i=0; i<indent; i++) {
ZEND_PUTS(" ");
}
ZEND_PUTS("[");
switch (zend_hash_get_current_key(ht, &string_key, &num_key)) {
switch (zend_hash_get_current_key_ex(ht, &string_key, &str_len, &num_key, &iterator)) {
case HASH_KEY_IS_STRING:
ZEND_PUTS(string_key);
efree(string_key);
@@ -107,14 +106,13 @@ static void print_hash(HashTable *ht, int indent)
ZEND_PUTS("] => ");
zend_print_zval_r(*tmp, indent+PRINT_ZVAL_INDENT);
ZEND_PUTS("\n");
zend_hash_move_forward(ht);
zend_hash_move_forward_ex(ht, &iterator);
}
indent -= PRINT_ZVAL_INDENT;
for (i=0; i<indent; i++) {
ZEND_PUTS(" ");
}
ZEND_PUTS(")\n");
ht->pInternalPointer = save_internal_pointer;
}