CVS update: php4/ext/standard

Date: Friday June 11, 1999 @ 11:54 Author: andrey Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv9384/ext/standard Modified Files: var.c Log Message: Fix up var.c a bit. Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.10 php4/ext/standard/var.c:1.11 --- php4/ext/standard/var.c:1.10 Thu Jun 10 11:34:20 1999 +++ php4/ext/standard/var.c Fri Jun 11 11:54:06 1999 @@ -199,7 +199,7 @@ STR_CAT(buf, s, slen); if (i > 0) { char *key; - pval *data,*d; + pval **data,*d; ulong index; _php3_hash_internal_pointer_reset((*struc)->value.ht); @@ -207,12 +207,10 @@ if ((i = _php3_hash_get_current_key((*struc)->value.ht, &key, &index)) == HASH_KEY_NON_EXISTANT) { break; } - if (_php3_hash_get_current_data((*struc)->value.ht, (void **) (&data)) != SUCCESS || !data || (data == (*struc))) { + if (_php3_hash_get_current_data((*struc)->value.ht, (void **) (&data)) != + SUCCESS || !data || ((*data) == (*struc))) { continue; } - if (data->type==IS_STRING && data->value.str.val==undefined_variable_string) { - continue; - } switch (i) { case HASH_KEY_IS_LONG: @@ -244,18 +242,16 @@ STR_CAT(buf, s, slen); if (i > 0) { char *key; - pval *data,*d; + pval **data,*d; ulong index; zend_hash_internal_pointer_reset((*struc)->value.obj.properties); for (;; _php3_hash_move_forward((*struc)->value.obj.properties)) { if ((i = _php3_hash_get_current_key((*struc)->value.obj.properties, &key, &index)) == HASH_KEY_NON_EXISTANT) { break; - } - if (_php3_hash_get_current_data((*struc)->value.obj.properties, (void **) (&data)) != SUCCESS || !data || (data == (*struc))) { - continue; } - if (data->type==IS_STRING && data->value.str.val==undefined_variable_string) { + if (_php3_hash_get_current_data((*struc)->value.obj.properties, (void **) + (&data)) != SUCCESS || !data || ((*data) == (*struc))) { continue; }