cvs: php4 /ext/domxml php_domxml.c /ext/icap php_icap.c /ext/qtdom qtdom.c

andi Mon Aug 13 14:47:52 2001 EDT Modified files: /php4/ext/domxml php_domxml.c /php4/ext/icap php_icap.c /php4/ext/qtdom qtdom.c Log: - More Engine 2 work. Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.58 php4/ext/domxml/php_domxml.c:1.59 --- php4/ext/domxml/php_domxml.c:1.58 Mon Aug 13 04:08:18 2001 +++ php4/ext/domxml/php_domxml.c Mon Aug 13 14:47:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.58 2001/08/13 08:08:18 joey Exp $ */ +/* $Id: php_domxml.c,v 1.59 2001/08/13 18:47:51 andi Exp $ */ #ifdef HAVE_CONFIG_H @@ -2325,7 +2325,7 @@ pattr = php_domobject_new((xmlNodePtr) attr, &ret TSRMLS_CC); /** XXX FIXME XXX */ /* if(0 <= (n = node_children(&children, attr->children TSRMLS_CC))) { - zend_hash_update(pattr->value.obj.properties, "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(value), "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); } */ add_property_string(pattr, "name", (char *) (attr->name), 1); add_property_string(pattr, "value", xmlNodeGetContent((xmlNodePtr) attr), 1); @@ -2365,7 +2365,7 @@ /* Get the namespace of the current node and add it as a property */ /* XXX FIXME XXX */ /* if(!node_namespace(&namespace, last)) - zend_hash_update(child->value.obj.properties, "namespace", sizeof("namespace"), (void *) &namespace, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "namespace", sizeof("namespace"), (void *) &namespace, sizeof(zval *), NULL); */ /* Get the attributes of the current node and add it as a property */ Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.27 php4/ext/icap/php_icap.c:1.28 --- php4/ext/icap/php_icap.c:1.27 Sat Aug 11 12:38:45 2001 +++ php4/ext/icap/php_icap.c Mon Aug 13 14:47:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_icap.c,v 1.27 2001/08/11 16:38:45 zeev Exp $ */ +/* $Id: php_icap.c,v 1.28 2001/08/13 18:47:51 andi Exp $ */ #define ICAP1 @@ -141,7 +141,7 @@ HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } Index: php4/ext/qtdom/qtdom.c diff -u php4/ext/qtdom/qtdom.c:1.10 php4/ext/qtdom/qtdom.c:1.11 --- php4/ext/qtdom/qtdom.c:1.10 Mon Aug 13 12:40:03 2001 +++ php4/ext/qtdom/qtdom.c Mon Aug 13 14:47:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: qtdom.c,v 1.10 2001/08/13 16:40:03 andi Exp $ */ +/* $Id: qtdom.c,v 1.11 2001/08/13 18:47:52 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -190,10 +190,7 @@ child_node = qdom_do_first_child( child_node ); if ( qdom_find_children( &n_children, child_node TSRMLS_CC) > 0 ) { - zend_hash_update(child->value.obj.properties, - "children", sizeof("children"), - (void *) &n_children, sizeof(zval *), - NULL); + zend_hash_update(Z_OBJPROP_P(child), "children", sizeof("children"), (void *) &n_children, sizeof(zval *), NULL); } qdom_do_node_free( child_node ); } @@ -242,7 +239,7 @@ if ( qdom_find_children( &children, node TSRMLS_CC) > 0 ) { add_property_long(return_value, "type", node->Type); - zend_hash_update(return_value->value.obj.properties, "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); } qdom_do_free( doc );