diff options
| author | Andi Gutmans <andi@php.net> | 2001-08-13 18:47:52 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-08-13 18:47:52 +0000 |
| commit | ad18bd07f1892e9c3445e4b6acb4e6ada70c1a45 (patch) | |
| tree | 69a2d15caf06e7065e8c366af2d5517f7c1f261d /ext | |
| parent | 33539126d0511b4178443724a68de43dc8d228a4 (diff) | |
| download | php-git-ad18bd07f1892e9c3445e4b6acb4e6ada70c1a45.tar.gz | |
- More Engine 2 work.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/domxml/php_domxml.c | 4 | ||||
| -rw-r--r-- | ext/icap/php_icap.c | 2 | ||||
| -rw-r--r-- | ext/qtdom/qtdom.c | 7 |
3 files changed, 5 insertions, 8 deletions
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 ); |