From: Andi Gutmans <andi@php.net>
Date: Mon, 13 Aug 2001 18:47:52 +0000 (+0000)
Subject: - More Engine 2 work.
X-Git-Tag: php-4.0.7RC1~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad18bd07f1892e9c3445e4b6acb4e6ada70c1a45;p=php

- More Engine 2 work.
---

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index aac047f1d8..71b5771573 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -2325,7 +2325,7 @@ static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC)
 		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 @@ static int node_children(zval **children, xmlNode *nodep TSRMLS_DC)
 		/* 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 */
diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index 692206a496..327e6d120a 100644
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -141,7 +141,7 @@ static int add_assoc_object(pval *arg, char *key, pval *tmp)
         HashTable *symtable;
         
         if (arg->type == IS_OBJECT) {
-                symtable = arg->value.obj.properties;
+                symtable = Z_OBJPROP_P(arg);
         } else {
                 symtable = arg->value.ht;
         }
diff --git a/ext/qtdom/qtdom.c b/ext/qtdom/qtdom.c
index 7c4bb4386e..0fa2093abd 100644
--- a/ext/qtdom/qtdom.c
+++ b/ext/qtdom/qtdom.c
@@ -190,10 +190,7 @@ static int qdom_find_children( zval **children, struct qdom_node *orig_node TSRM
             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 @@ PHP_FUNCTION(qdom_tree)
     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 );