summaryrefslogtreecommitdiff
path: root/ext/domxml
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-04-09 19:14:44 +0000
committerMarcus Boerger <helly@php.net>2003-04-09 19:14:44 +0000
commit1cdd29eeef54725cf6f719e92253042a5db2c3f4 (patch)
treedeacda7439da7e60e13b6298b31c798371be2650 /ext/domxml
parent861679d6c3e90f262440662d574c8f258c33be46 (diff)
downloadphp-git-1cdd29eeef54725cf6f719e92253042a5db2c3f4.tar.gz
Fix ZTS build and warnings
Diffstat (limited to 'ext/domxml')
-rw-r--r--ext/domxml/php_domxml.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index fc3b68b839..27e41b5d97 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -606,6 +606,7 @@ static inline void node_wrapper_free(xmlNodePtr node)
{
zval *wrapper, **handle;
int type, refcount = 0;
+ TSRMLS_FETCH();
if (!node) {
return;
@@ -1828,7 +1829,7 @@ PHP_FUNCTION(domxml_attr_value)
DOMXML_NO_ARGS();
/* RETURN_STRING((char *) xmlNodeGetContent((xmlNodePtr) attrp), 1); */
- if (content = xmlNodeGetContent((xmlNodePtr) attrp)) {
+ if ((content = xmlNodeGetContent((xmlNodePtr) attrp)) != NULL) {
RETVAL_STRING(content,1);
} else {
RETURN_EMPTY_STRING();
@@ -1909,7 +1910,7 @@ PHP_FUNCTION(domxml_pi_data)
DOMXML_NO_ARGS();
/* RETURN_STRING(xmlNodeGetContent(nodep), 1); */
- if (content = xmlNodeGetContent(nodep)) {
+ if ((content = xmlNodeGetContent(nodep)) != NULL) {
RETVAL_STRING(content,1);
} else {
RETURN_EMPTY_STRING();