cvs: php4 /ext/wddx wddx.c

andi Sat Jul 28 15:11:06 2001 EDT Modified files: /php4/ext/wddx wddx.c Log: - More object macros Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.72 php4/ext/wddx/wddx.c:1.73 --- php4/ext/wddx/wddx.c:1.72 Sat Jul 28 07:36:23 2001 +++ php4/ext/wddx/wddx.c Sat Jul 28 15:11:05 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.72 2001/07/28 11:36:23 zeev Exp $ */ +/* $Id: wddx.c,v 1.73 2001/07/28 19:11:05 andi Exp $ */ #include "php.h" #include "php_wddx.h" @@ -431,6 +431,7 @@ */ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj) { +/* OBJECTS_FIXME */ zval **ent, *fname, **varname; zval *retval = NULL; char *key; @@ -512,8 +513,9 @@ zval_dtor(fname); FREE_ZVAL(fname); - if (retval) + if (retval) { zval_ptr_dtor(&retval); + } } /* }}} */ @@ -784,6 +786,7 @@ zval *tmp; TSRMLS_FETCH(); +/* OBJECTS_FIXME */ if (stack->top == 0) return; @@ -842,13 +845,14 @@ object_init_ex(obj, ce); /* Merge current hashtable with object's default properties */ - zend_hash_merge(obj->value.obj.properties, + zend_hash_merge(Z_OBJPROP_P(obj), Z_ARRVAL_P(ent2->data), (void (*)(void *)) zval_add_ref, (void *) &tmp, sizeof(zval *), 0); - if (incomplete_class) + if (incomplete_class) { php_store_class_name(obj, Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data)); + } /* Clean up old array entry */ zval_dtor(ent2->data); @@ -874,9 +878,9 @@ } efree(ent1); } - } - else if (!strcmp(name, EL_VAR) && stack->varname) + } else if (!strcmp(name, EL_VAR) && stack->varname) { efree(stack->varname); + } } /* }}} */