cvs: /php4/ext/mysql php_mysql.c /php4/ext/wddx wddx.c

andrei Tue Jan 4 09:41:58 2000 EDT Modified files: /php4/ext/mysql php_mysql.c /php4/ext/wddx wddx.c Log: Fix IS_UNSET -> IS_NULL rename. Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.22 php4/ext/mysql/php_mysql.c:1.23 --- php4/ext/mysql/php_mysql.c:1.22 Sat Jan 1 11:54:55 2000 +++ php4/ext/mysql/php_mysql.c Tue Jan 4 09:41:55 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.22 2000/01/01 16:54:55 thies Exp $ */ +/* $Id: php_mysql.c,v 1.23 2000/01/04 14:41:55 andrei Exp $ */ /* TODO: @@ -1257,7 +1257,7 @@ return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len); } } else { - return_value->type = IS_UNSET; + return_value->type = IS_NULL; } } /* }}} */ Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.20 php4/ext/wddx/wddx.c:1.21 --- php4/ext/wddx/wddx.c:1.20 Mon Jan 3 13:10:27 2000 +++ php4/ext/wddx/wddx.c Tue Jan 4 09:41:56 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.20 2000/01/03 18:10:27 andrei Exp $ */ +/* $Id: wddx.c,v 1.21 2000/01/04 14:41:56 andrei Exp $ */ #include "php.h" #include "php_wddx.h" @@ -442,7 +442,7 @@ php_wddx_serialize_boolean(packet, var); break; - case IS_UNSET: + case IS_NULL: php_wddx_serialize_unset(packet); break; @@ -548,7 +548,7 @@ ALLOC_ZVAL(ent.data); INIT_PZVAL(ent.data); - ent.data->type = IS_UNSET; + ZVAL_NULL(ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); } else if (!strcmp(name, EL_ARRAY)) {