CVS update: php3/functions
| From: | andrey | Date: | Fri, 05 Feb 1999 06:13:26 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-3903@lists.php.net to get a copy of this message | ||
Date: Friday February 5, 1999 @ 1:13
Author: andrey
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv27496/functions
Modified Files:
wddx_a.c
Log Message:
Bug fixes.
Index: php3/functions/wddx_a.c
diff -c php3/functions/wddx_a.c:1.1 php3/functions/wddx_a.c:1.2
*** php3/functions/wddx_a.c:1.1 Tue Feb 2 00:44:12 1999
--- php3/functions/wddx_a.c Fri Feb 5 01:13:26 1999
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: wddx_a.c,v 1.1 1999/02/02 05:44:12 andrey Exp $ */
#include "php.h"
#include "internal_functions.h"
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: wddx_a.c,v 1.2 1999/02/05 06:13:26 andrey Exp $ */
#include "php.h"
#include "internal_functions.h"
***************
*** 350,356 ****
while(_php3_hash_get_current_data(var->value.ht, (void**)&ent) == SUCCESS) {
if (ent->type == IS_STRING &&
ent->value.str.val == undefined_variable_string)
! continue;
else
break;
}
--- 350,356 ----
while(_php3_hash_get_current_data(var->value.ht, (void**)&ent) == SUCCESS) {
if (ent->type == IS_STRING &&
ent->value.str.val == undefined_variable_string)
! _php3_hash_move_forward(var->value.ht);
else
break;
}
***************
*** 365,386 ****
}
while(_php3_hash_get_current_data(var->value.ht, (void**)&ent) == SUCCESS) {
! if (ent->type == IS_STRING &&
! ent->value.str.val == undefined_variable_string)
! continue;
! if (hash_type == HASH_KEY_IS_STRING) {
! ent_type = _php3_hash_get_current_key(var->value.ht, &key, &idx);
! if (ent_type == HASH_KEY_IS_STRING) {
! _php3_wddx_serialize_var(packet, ent, key);
! efree(key);
! } else {
! sprintf(tmp_buf, "%ld", idx);
! _php3_wddx_serialize_var(packet, ent, tmp_buf);
! }
! } else
! _php3_wddx_serialize_var(packet, ent, NULL);
_php3_hash_move_forward(var->value.ht);
}
--- 365,387 ----
}
while(_php3_hash_get_current_data(var->value.ht, (void**)&ent) == SUCCESS) {
! if (!(ent->type == IS_STRING &&
! ent->value.str.val == undefined_variable_string)) {
! if (hash_type == HASH_KEY_IS_STRING) {
! ent_type = _php3_hash_get_current_key(var->value.ht, &key, &idx);
!
! if (ent_type == HASH_KEY_IS_STRING) {
! _php3_wddx_serialize_var(packet, ent, key);
! efree(key);
! } else {
! sprintf(tmp_buf, "%ld", idx);
! _php3_wddx_serialize_var(packet, ent, tmp_buf);
! }
! } else
! _php3_wddx_serialize_var(packet, ent, NULL);
! }
_php3_hash_move_forward(var->value.ht);
}
***************
*** 443,453 ****
_php3_hash_internal_pointer_reset(name_var->value.ht);
while(_php3_hash_get_current_data(name_var->value.ht, (void**)&val) == SUCCESS) {
! if (val->type == IS_STRING &&
! val->value.str.val == undefined_variable_string)
! continue;
!
! _php3_wddx_add_var(packet, val);
_php3_hash_move_forward(name_var->value.ht);
}
}
--- 444,453 ----
_php3_hash_internal_pointer_reset(name_var->value.ht);
while(_php3_hash_get_current_data(name_var->value.ht, (void**)&val) == SUCCESS) {
! if (!(val->type == IS_STRING &&
! val->value.str.val == undefined_variable_string))
! _php3_wddx_add_var(packet, val);
!
_php3_hash_move_forward(name_var->value.ht);
}
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net