cvs: php4 /ext/domxml php_domxml.c
| From: | Marcus Boerger | Date: | Wed, 09 Apr 2003 19:14:44 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20198@lists.php.net to get a copy of this message | ||
helly Wed Apr 9 15:14:44 2003 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
Fix ZTS build and warnings
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.249 php4/ext/domxml/php_domxml.c:1.250
--- php4/ext/domxml/php_domxml.c:1.249 Wed Apr 9 03:29:39 2003
+++ php4/ext/domxml/php_domxml.c Wed Apr 9 15:14:44 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.249 2003/04/09 07:29:39 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.250 2003/04/09 19:14:44 helly Exp $ */
/* TODO
* - Support Notation Nodes
@@ -606,6 +606,7 @@
{
zval *wrapper, **handle;
int type, refcount = 0;
+ TSRMLS_FETCH();
if (!node) {
return;
@@ -1828,7 +1829,7 @@
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 @@
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();