Skip to content

Commit fc487f4

Browse files
author
Joey Smith
committed
Change to Z_* macros.
1 parent ecb2b08 commit fc487f4

File tree

1 file changed

+38
-36
lines changed

1 file changed

+38
-36
lines changed

‎ext/domxml/php_domxml.c

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,11 @@ static zval *php_xpathobject_new(xmlXPathObjectPtr obj, int *found TSRMLS_DC)
464464
}
465465

466466
MAKE_STD_ZVAL(wrapper);
467-
/* fprintf(stderr, "Adding new XPath Object\n"); */
468467
object_init_ex(wrapper, xpathobject_class_entry);
469-
rsrc_type = le_xpathobjectp;
470-
php_xpath_set_object(wrapper, (void *) obj, rsrc_type);
468+
/* rsrc_type = le_xpathobjectp;
469+
php_xpath_set_object(wrapper, (void *) obj, rsrc_type); */
470+
471+
php_xpath_set_object(wrapper, (void *) obj, le_xpathobjectp);
471472

472473
return(wrapper);
473474
}
@@ -612,7 +613,6 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
612613
}
613614

614615
MAKE_STD_ZVAL(wrapper);
615-
/* fprintf(stderr, "Adding new Node of type: %d\n", obj->type); */
616616
switch(obj->type) {
617617
case XML_ELEMENT_NODE: {
618618
xmlNodePtr nodep = obj;
@@ -857,7 +857,7 @@ PHP_FUNCTION(domxml_test)
857857
WRONG_PARAM_COUNT;
858858

859859
convert_to_long(id);
860-
RETURN_LONG(id->value.lval);
860+
RETURN_LONG(Z_LVAL_P(id));
861861
}
862862
/* }}} */
863863

@@ -986,7 +986,7 @@ PHP_FUNCTION(domxml_node)
986986
}
987987
convert_to_string(arg);
988988

989-
node = xmlNewNode(NULL, arg->value.str.val);
989+
node = xmlNewNode(NULL, Z_STRVAL_P(arg));
990990
if (!node) {
991991
RETURN_FALSE;
992992
}
@@ -1448,8 +1448,8 @@ PHP_FUNCTION(domxml_node_set_name)
14481448
nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
14491449
convert_to_string(name);
14501450

1451-
if(name->value.str.len)
1452-
xmlNodeSetName(nodep, name->value.str.val);
1451+
if(Z_STRLEN_P(name))
1452+
xmlNodeSetName(nodep, Z_STRVAL_P(name));
14531453

14541454
RETURN_TRUE;
14551455
}
@@ -1509,10 +1509,10 @@ PHP_FUNCTION(domxml_node_new_child)
15091509
convert_to_string(name);
15101510
convert_to_string(content);
15111511

1512-
if(content->value.str.len)
1513-
child = xmlNewChild(nodep, NULL, name->value.str.val, content->value.str.val);
1512+
if(Z_STRLEN_P(content))
1513+
child = xmlNewChild(nodep, NULL, Z_STRVAL_P(name), Z_STRVAL_P(content));
15141514
else
1515-
child = xmlNewChild(nodep, NULL, name->value.str.val, NULL);
1515+
child = xmlNewChild(nodep, NULL, Z_STRVAL_P(name), NULL);
15161516
if (!child) {
15171517
RETURN_FALSE;
15181518
}
@@ -1538,8 +1538,8 @@ PHP_FUNCTION(domxml_node_set_content)
15381538
nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
15391539
convert_to_string(content);
15401540

1541-
if(content->value.str.len)
1542-
xmlNodeSetContent(nodep, content->value.str.val);
1541+
if(Z_STRLEN_P(content))
1542+
xmlNodeSetContent(nodep, Z_STRVAL_P(content));
15431543

15441544
/* FIXME: Actually the property 'content' of the node has to be updated
15451545
as well. Since 'content' should disappear sooner or later and being
@@ -1597,7 +1597,7 @@ PHP_FUNCTION(domxml_element)
15971597
}
15981598
convert_to_string(arg);
15991599

1600-
node = xmlNewNode(NULL, arg->value.str.val);
1600+
node = xmlNewNode(NULL, Z_STRVAL_P(arg));
16011601
if (!node) {
16021602
RETURN_FALSE;
16031603
}
@@ -1639,7 +1639,7 @@ PHP_FUNCTION(domxml_elem_get_attribute)
16391639

16401640
convert_to_string(arg1);
16411641

1642-
value = xmlGetProp(nodep, arg1->value.str.val);
1642+
value = xmlGetProp(nodep, Z_STRVAL_P(arg1));
16431643
if (!value) {
16441644
RETURN_EMPTY_STRING();
16451645
} else {
@@ -1667,9 +1667,9 @@ PHP_FUNCTION(domxml_elem_set_attribute)
16671667
convert_to_string(arg1);
16681668
convert_to_string(arg2);
16691669

1670-
attr = xmlSetProp(nodep, arg1->value.str.val, arg2->value.str.val);
1670+
attr = xmlSetProp(nodep, Z_STRVAL_P(arg1), Z_STRVAL_P(arg2));
16711671
if (!attr) {
1672-
php_error(E_WARNING, "No such attribute '%s'", arg1->value.str.val);
1672+
php_error(E_WARNING, "No such attribute '%s'", Z_STRVAL_P(arg1));
16731673
RETURN_FALSE;
16741674
}
16751675
rv = php_domobject_new((xmlNodePtr) attr, &ret TSRMLS_CC);
@@ -1884,7 +1884,7 @@ PHP_FUNCTION(domxml_doc_create_element)
18841884
}
18851885
convert_to_string(arg);
18861886

1887-
node = xmlNewNode(NULL, arg->value.str.val);
1887+
node = xmlNewNode(NULL, Z_STRVAL_P(arg));
18881888
if (!node) {
18891889
RETURN_FALSE;
18901890
}
@@ -1916,7 +1916,7 @@ PHP_FUNCTION(domxml_doc_create_text_node)
19161916
}
19171917
convert_to_string(arg);
19181918

1919-
node = xmlNewText(arg->value.str.val);
1919+
node = xmlNewText(Z_STRVAL_P(arg));
19201920
if (!node) {
19211921
RETURN_FALSE;
19221922
}
@@ -1948,7 +1948,7 @@ PHP_FUNCTION(domxml_doc_create_comment)
19481948
}
19491949
convert_to_string(arg);
19501950

1951-
node = xmlNewComment(arg->value.str.val);
1951+
node = xmlNewComment(Z_STRVAL_P(arg));
19521952
if (!node) {
19531953
RETURN_FALSE;
19541954
}
@@ -2050,7 +2050,7 @@ PHP_FUNCTION(domxml_doc_imported_node)
20502050

20512051
convert_to_long(arg2);
20522052

2053-
node = xmlCopyNode(srcnode, arg2->value.lval);
2053+
node = xmlCopyNode(srcnode, Z_LVAL_P(arg2));
20542054
if (!node) {
20552055
RETURN_FALSE;
20562056
}
@@ -2128,10 +2128,10 @@ PHP_FUNCTION(xmldoc)
21282128
if(Z_BVAL_PP(argv[1])) {
21292129
docp = xmlParseFile(Z_STRVAL_PP(argv[0]));
21302130
} else {
2131-
docp = xmlParseDoc((*argv[0])->value.str.val);
2131+
docp = xmlParseDoc(Z_STRVAL_PP(argv[0]));
21322132
}
21332133
} else {
2134-
docp = xmlParseDoc((*argv[0])->value.str.val);
2134+
docp = xmlParseDoc(Z_STRVAL_PP(argv[0]));
21352135
}
21362136
if (!docp)
21372137
RETURN_FALSE;
@@ -2155,7 +2155,7 @@ PHP_FUNCTION(xmldocfile)
21552155
}
21562156
convert_to_string(arg);
21572157

2158-
docp = xmlParseFile(arg->value.str.val);
2158+
docp = xmlParseFile(Z_STRVAL_P(arg));
21592159
if (!docp) {
21602160
RETURN_FALSE;
21612161
}
@@ -2197,8 +2197,8 @@ PHP_FUNCTION(domxml_node_text_concat)
21972197
nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
21982198
convert_to_string(content);
21992199

2200-
if(content->value.str.len)
2201-
xmlTextConcat(nodep, content->value.str.val, content->value.str.len);
2200+
if(Z_STRLEN_P(content))
2201+
xmlTextConcat(nodep, Z_STRVAL_P(content), Z_STRVAL_P(content));
22022202

22032203
RETURN_TRUE;
22042204
}
@@ -2221,7 +2221,7 @@ PHP_FUNCTION(domxml_add_root)
22212221
docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC);
22222222
convert_to_string(name);
22232223

2224-
nodep = xmlNewDocNode(docp, NULL, name->value.str.val, NULL);
2224+
nodep = xmlNewDocNode(docp, NULL, Z_STRVAL_P(name), NULL);
22252225
if (!nodep) {
22262226
RETURN_FALSE;
22272227
}
@@ -2247,7 +2247,7 @@ PHP_FUNCTION(domxml_new_xmldoc)
22472247
}
22482248
convert_to_string(arg);
22492249

2250-
docp = xmlNewDoc(arg->value.str.val);
2250+
docp = xmlNewDoc(Z_STRVAL_P(arg));
22512251
if (!docp) {
22522252
RETURN_FALSE;
22532253
}
@@ -2293,7 +2293,7 @@ static int node_namespace(zval **attributes, xmlNode *nodep TSRMLS_DC)
22932293
add_property_stringl(pattr, "prefix", (char *) ns->prefix, strlen(ns->prefix), 1);
22942294
add_property_long(pattr, "type", ns->type);
22952295
/* } */
2296-
zend_hash_next_index_insert((*attributes)->value.ht, &pattr, sizeof(zval *), NULL);
2296+
zend_hash_next_index_insert(Z_ARRVAL_PP(attributes), &pattr, sizeof(zval *), NULL);
22972297
ns = ns->next;
22982298
}
22992299
return 0;
@@ -2323,12 +2323,13 @@ static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC)
23232323
int ret;
23242324

23252325
pattr = php_domobject_new((xmlNodePtr) attr, &ret TSRMLS_CC);
2326+
/** XXX FIXME XXX */
23262327
/* if(0 <= (n = node_children(&children, attr->children TSRMLS_CC))) {
23272328
zend_hash_update(pattr->value.obj.properties, "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL);
23282329
}
23292330
*/ add_property_string(pattr, "name", (char *) (attr->name), 1);
23302331
add_property_string(pattr, "value", xmlNodeGetContent((xmlNodePtr) attr), 1);
2331-
zend_hash_next_index_insert((*attributes)->value.ht, &pattr, sizeof(zval *), NULL);
2332+
zend_hash_next_index_insert(Z_ARRVAL_PP(attributes), &pattr, sizeof(zval *), NULL);
23322333
attr = attr->next;
23332334
count++;
23342335
}
@@ -2359,9 +2360,10 @@ static int node_children(zval **children, xmlNode *nodep TSRMLS_DC)
23592360
int ret;
23602361

23612362
child = php_domobject_new(last, &ret TSRMLS_CC);
2362-
zend_hash_next_index_insert((*children)->value.ht, &child, sizeof(zval *), NULL);
2363+
zend_hash_next_index_insert(Z_ARRVAL_PP(children), &child, sizeof(zval *), NULL);
23632364

23642365
/* Get the namespace of the current node and add it as a property */
2366+
/* XXX FIXME XXX */
23652367
/* if(!node_namespace(&namespace, last))
23662368
zend_hash_update(child->value.obj.properties, "namespace", sizeof("namespace"), (void *) &namespace, sizeof(zval *), NULL);
23672369
*/
@@ -2395,7 +2397,7 @@ PHP_FUNCTION(xmltree)
23952397
convert_to_string(arg);
23962398

23972399
/* Create a new xml document */
2398-
docp = xmlParseDoc(arg->value.str.val);
2400+
docp = xmlParseDoc(Z_STRVAL_P(arg));
23992401
if (!docp) {
24002402
RETURN_FALSE;
24012403
}
@@ -2529,13 +2531,13 @@ static void php_xpathptr_eval(INTERNAL_FUNCTION_PARAMETERS, int mode, int expr)
25292531

25302532
#if defined(LIBXML_XPTR_ENABLED)
25312533
if(mode == PHP_XPTR) {
2532-
xpathobjp = xmlXPtrEval(BAD_CAST str->value.str.val, ctxp);
2534+
xpathobjp = xmlXPtrEval(BAD_CAST Z_STRVAL_P(str), ctxp);
25332535
} else{
25342536
#endif
25352537
if(expr)
2536-
xpathobjp = xmlXPathEvalExpression(str->value.str.val, ctxp);
2538+
xpathobjp = xmlXPathEvalExpression(Z_STRVAL_P(str), ctxp);
25372539
else
2538-
xpathobjp = xmlXPathEval(str->value.str.val, ctxp);
2540+
xpathobjp = xmlXPathEval(Z_STRVAL_P(str), ctxp);
25392541
#if defined(LIBXML_XPTR_ENABLED)
25402542
}
25412543
#endif
@@ -2574,7 +2576,7 @@ static void php_xpathptr_eval(INTERNAL_FUNCTION_PARAMETERS, int mode, int expr)
25742576

25752577
/* construct a node object */
25762578
child = php_domobject_new(node, &retnode TSRMLS_CC);
2577-
zend_hash_next_index_insert(arr->value.ht, &child, sizeof(zval *), NULL);
2579+
zend_hash_next_index_insert(Z_ARRVAL_P(arr), &child, sizeof(zval *), NULL);
25782580
}
25792581
zend_hash_update(Z_OBJPROP_P(rv), "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL);
25802582
break;

0 commit comments

Comments
 (0)