cvs: php-src /ext/curl interface.c /ext/dom attr.c document.c domimplementation.c node.c php_dom.c php_dom.h xml_common.h xpath.c
| From: | Ilia Alshanetsky | Date: | Thu, 21 Apr 2005 21:11:24 +0000 |
| Subject: | cvs: php-src /ext/curl interface.c /ext/dom attr.c document.c domimplementation.c node.c php_dom.c php_dom.h xml_common.h xpath.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31534@lists.php.net to get a copy of this message | ||
iliaa Thu Apr 21 17:11:24 2005 EDT
Modified files:
/php-src/ext/curl interface.c
/php-src/ext/dom attr.c document.c domimplementation.c node.c
php_dom.c php_dom.h xml_common.h xpath.c
Log:
php_error() -> php_error_docref().
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.55&r2=1.56&ty=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.55 php-src/ext/curl/interface.c:1.56 --- php-src/ext/curl/interface.c:1.55 Mon Mar 14 04:02:23 2005 +++ php-src/ext/curl/interface.c Thu Apr 21 17:11:21 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.55 2005/03/14 09:02:23 sniper Exp $ */ +/* $Id: interface.c,v 1.56 2005/04/21 21:11:21 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -868,7 +868,7 @@ cp = curl_easy_duphandle(ch->cp); if (!cp) { - php_error(E_WARNING, "Cannot duplicate cURL handle"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot duplicate cURL handle"); RETURN_FALSE; } http://cvs.php.net/diff.php/php-src/ext/dom/attr.c?r1=1.16&r2=1.17&ty=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.16 php-src/ext/dom/attr.c:1.17 --- php-src/ext/dom/attr.c:1.16 Thu Nov 18 14:54:29 2004 +++ php-src/ext/dom/attr.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.16 2004/11/18 19:54:29 rrichards Exp $ */ +/* $Id: attr.c,v 1.17 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -225,7 +225,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(nodeparent, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.65&r2=1.66&ty=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.65 php-src/ext/dom/document.c:1.66 --- php-src/ext/dom/document.c:1.65 Sun Apr 10 17:37:17 2005 +++ php-src/ext/dom/document.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.65 2005/04/10 21:37:17 andrey Exp $ */ +/* $Id: document.c,v 1.66 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -113,7 +113,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -165,7 +165,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(root, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -1635,7 +1635,7 @@ } if (file_len == 0) { - php_error(E_WARNING, "Invalid Filename"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename"); RETURN_FALSE; } @@ -1687,7 +1687,7 @@ } buf = xmlBufferCreate(); if (!buf) { - php_error(E_WARNING, "Could not fetch buffer"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch buffer"); RETURN_FALSE; } @@ -1697,7 +1697,7 @@ xmlBufferFree(buf); RETURN_FALSE; } - RETVAL_STRING(mem, 1); + RETVAL_STRING(mem, 1); xmlBufferFree(buf); } else { /* Encoding is handled from the encoding property set on the document */ @@ -1844,7 +1844,7 @@ } if (source_len == 0) { - php_error(E_WARNING, "Invalid Schema source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema source"); RETURN_FALSE; } @@ -1854,7 +1854,7 @@ case DOM_LOAD_FILE: valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); if (!valid_file) { - php_error(E_WARNING, "Invalid Schema file source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema file source"); RETURN_FALSE; } parser = xmlSchemaNewParserCtxt(valid_file); @@ -1875,7 +1875,7 @@ sptr = xmlSchemaParse(parser); xmlSchemaFreeParserCtxt(parser); if (!sptr) { - php_error(E_WARNING, "Invalid Schema"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema"); RETURN_FALSE; } @@ -1934,7 +1934,7 @@ } if (source_len == 0) { - php_error(E_WARNING, "Invalid Schema source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema source"); RETURN_FALSE; } @@ -1944,7 +1944,7 @@ case DOM_LOAD_FILE: valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); if (!valid_file) { - php_error(E_WARNING, "Invalid RelaxNG file source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid RelaxNG file source"); RETURN_FALSE; } parser = xmlRelaxNGNewParserCtxt(valid_file); @@ -1965,7 +1965,7 @@ sptr = xmlRelaxNGParse(parser); xmlRelaxNGFreeParserCtxt(parser); if (!sptr) { - php_error(E_WARNING, "Invalid RelaxNG"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid RelaxNG"); RETURN_FALSE; } @@ -2115,7 +2115,7 @@ } if (file_len == 0) { - php_error(E_WARNING, "Invalid Filename"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename"); RETURN_FALSE; } http://cvs.php.net/diff.php/php-src/ext/dom/domimplementation.c?r1=1.13&r2=1.14&ty=u Index: php-src/ext/dom/domimplementation.c diff -u php-src/ext/dom/domimplementation.c:1.13 php-src/ext/dom/domimplementation.c:1.14 --- php-src/ext/dom/domimplementation.c:1.13 Mon May 31 08:50:28 2004 +++ php-src/ext/dom/domimplementation.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementation.c,v 1.13 2004/05/31 12:50:28 rrichards Exp $ */ +/* $Id: domimplementation.c,v 1.14 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -201,7 +201,7 @@ xmlFreeDoc(docp); xmlFree(localname); /* Need some type of error here */ - php_error(E_WARNING, "Unexpected Error"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected Error"); RETURN_FALSE; } http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.34&r2=1.35&ty=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.34 php-src/ext/dom/node.c:1.35 --- php-src/ext/dom/node.c:1.34 Mon Apr 18 19:07:49 2005 +++ php-src/ext/dom/node.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.34 2005/04/18 23:07:49 rrichards Exp $ */ +/* $Id: node.c,v 1.35 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -317,7 +317,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(nodeparent, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -389,7 +389,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(first, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -427,7 +427,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(last, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -462,7 +462,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(prevsib, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -497,7 +497,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(nextsib, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -573,7 +573,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -1299,7 +1299,7 @@ if (new_child == NULL) { new_child = xmlAddChild(nodep, child); if (new_child == NULL) { - php_error(E_WARNING, "Couldn't append node"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't append node"); RETURN_FALSE; } } http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.68&r2=1.69&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.68 php-src/ext/dom/php_dom.c:1.69 --- php-src/ext/dom/php_dom.c:1.68 Wed Feb 9 06:46:43 2005 +++ php-src/ext/dom/php_dom.c Thu Apr 21 17:11:23 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.68 2005/02/09 11:46:43 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.69 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -346,11 +346,11 @@ if (nodep && nodeobj && (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE)) { DOM_RET_OBJ(rv, (xmlNodePtr) nodep, &ret, (dom_object *)nodeobj); } else { - php_error(E_WARNING, "Invalid Nodetype to import"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import"); RETURN_NULL(); } #else - php_error(E_WARNING, "SimpleXML support is not enabled"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SimpleXML support is not enabled"); return; #endif } http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.h?r1=1.26&r2=1.27&ty=u Index: php-src/ext/dom/php_dom.h diff -u php-src/ext/dom/php_dom.h:1.26 php-src/ext/dom/php_dom.h:1.27 --- php-src/ext/dom/php_dom.h:1.26 Sun Feb 20 17:01:24 2005 +++ php-src/ext/dom/php_dom.h Thu Apr 21 17:11:23 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.h,v 1.26 2005/02/20 22:01:24 rrichards Exp $ */ +/* $Id: php_dom.h,v 1.27 2005/04/21 21:11:23 iliaa Exp $ */ #ifndef PHP_DOM_H #define PHP_DOM_H @@ -119,7 +119,7 @@ #define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = (dom_object *)zend_object_store_get_object(__id TSRMLS_CC); \ if (__intern->ptr == NULL || !(__ptr = (__prtype)((php_libxml_node_ptr *)__intern->ptr)->node)) { \ - php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } http://cvs.php.net/diff.php/php-src/ext/dom/xml_common.h?r1=1.20&r2=1.21&ty=u Index: php-src/ext/dom/xml_common.h diff -u php-src/ext/dom/xml_common.h:1.20 php-src/ext/dom/xml_common.h:1.21 --- php-src/ext/dom/xml_common.h:1.20 Fri Aug 13 08:32:55 2004 +++ php-src/ext/dom/xml_common.h Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml_common.h,v 1.20 2004/08/13 12:32:55 chregu Exp $ */ +/* $Id: xml_common.h,v 1.21 2005/04/21 21:11:23 iliaa Exp $ */ #ifndef PHP_XML_COMMON_H #define PHP_XML_COMMON_H @@ -68,7 +68,7 @@ #define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = (php_libxml_node_object *)zend_object_store_get_object(__id TSRMLS_CC); \ if (__intern->node == NULL || !(__ptr = (__prtype)__intern->node->node)) { \ - php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } @@ -77,7 +77,7 @@ __intern = (php_libxml_node_object *)zend_object_store_get_object(__id TSRMLS_CC); \ if (__intern->document != NULL) { \ if (!(__ptr = (__prtype)__intern->document->ptr)) { \ - php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } \ @@ -85,13 +85,13 @@ #define DOM_RET_OBJ(zval, obj, ret, domobject) \ if (NULL == (zval = php_dom_create_object(obj, ret, zval, return_value, domobject TSRMLS_CC))) { \ - php_error(E_WARNING, "Cannot create required DOM object"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \ RETURN_FALSE; \ } #define DOM_GET_THIS(zval) \ if (NULL == (zval = getThis())) { \ - php_error(E_WARNING, "Underlying object missing"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \ RETURN_FALSE; \ } http://cvs.php.net/diff.php/php-src/ext/dom/xpath.c?r1=1.24&r2=1.25&ty=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.24 php-src/ext/dom/xpath.c:1.25 --- php-src/ext/dom/xpath.c:1.24 Thu Nov 18 14:54:30 2004 +++ php-src/ext/dom/xpath.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.24 2004/11/18 19:54:30 rrichards Exp $ */ +/* $Id: xpath.c,v 1.25 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -96,7 +96,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -119,7 +119,7 @@ ctxp = (xmlXPathContextPtr) intern->ptr; if (ctxp == NULL) { - php_error(E_WARNING, "Invalid XPath Context"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context"); RETURN_FALSE; } @@ -159,13 +159,13 @@ ctxp = (xmlXPathContextPtr) intern->ptr; if (ctxp == NULL) { - php_error(E_WARNING, "Invalid XPath Context"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context"); RETURN_FALSE; } docp = (xmlDocPtr) ctxp->doc; if (docp == NULL) { - php_error(E_WARNING, "Invalid XPath Document Pointer"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Document Pointer"); RETURN_FALSE; } @@ -178,7 +178,7 @@ } if (nodep && docp != nodep->doc) { - php_error(E_WARNING, "Node From Wrong Document"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node From Wrong Document"); RETURN_FALSE; }
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.55&r2=1.56&ty=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.55 php-src/ext/curl/interface.c:1.56 --- php-src/ext/curl/interface.c:1.55 Mon Mar 14 04:02:23 2005 +++ php-src/ext/curl/interface.c Thu Apr 21 17:11:21 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.55 2005/03/14 09:02:23 sniper Exp $ */ +/* $Id: interface.c,v 1.56 2005/04/21 21:11:21 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -868,7 +868,7 @@ cp = curl_easy_duphandle(ch->cp); if (!cp) { - php_error(E_WARNING, "Cannot duplicate cURL handle"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot duplicate cURL handle"); RETURN_FALSE; } http://cvs.php.net/diff.php/php-src/ext/dom/attr.c?r1=1.16&r2=1.17&ty=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.16 php-src/ext/dom/attr.c:1.17 --- php-src/ext/dom/attr.c:1.16 Thu Nov 18 14:54:29 2004 +++ php-src/ext/dom/attr.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.16 2004/11/18 19:54:29 rrichards Exp $ */ +/* $Id: attr.c,v 1.17 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -225,7 +225,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(nodeparent, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.65&r2=1.66&ty=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.65 php-src/ext/dom/document.c:1.66 --- php-src/ext/dom/document.c:1.65 Sun Apr 10 17:37:17 2005 +++ php-src/ext/dom/document.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.65 2005/04/10 21:37:17 andrey Exp $ */ +/* $Id: document.c,v 1.66 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -113,7 +113,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -165,7 +165,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(root, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -1635,7 +1635,7 @@ } if (file_len == 0) { - php_error(E_WARNING, "Invalid Filename"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename"); RETURN_FALSE; } @@ -1687,7 +1687,7 @@ } buf = xmlBufferCreate(); if (!buf) { - php_error(E_WARNING, "Could not fetch buffer"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch buffer"); RETURN_FALSE; } @@ -1697,7 +1697,7 @@ xmlBufferFree(buf); RETURN_FALSE; } - RETVAL_STRING(mem, 1); + RETVAL_STRING(mem, 1); xmlBufferFree(buf); } else { /* Encoding is handled from the encoding property set on the document */ @@ -1844,7 +1844,7 @@ } if (source_len == 0) { - php_error(E_WARNING, "Invalid Schema source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema source"); RETURN_FALSE; } @@ -1854,7 +1854,7 @@ case DOM_LOAD_FILE: valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); if (!valid_file) { - php_error(E_WARNING, "Invalid Schema file source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema file source"); RETURN_FALSE; } parser = xmlSchemaNewParserCtxt(valid_file); @@ -1875,7 +1875,7 @@ sptr = xmlSchemaParse(parser); xmlSchemaFreeParserCtxt(parser); if (!sptr) { - php_error(E_WARNING, "Invalid Schema"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema"); RETURN_FALSE; } @@ -1934,7 +1934,7 @@ } if (source_len == 0) { - php_error(E_WARNING, "Invalid Schema source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema source"); RETURN_FALSE; } @@ -1944,7 +1944,7 @@ case DOM_LOAD_FILE: valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); if (!valid_file) { - php_error(E_WARNING, "Invalid RelaxNG file source"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid RelaxNG file source"); RETURN_FALSE; } parser = xmlRelaxNGNewParserCtxt(valid_file); @@ -1965,7 +1965,7 @@ sptr = xmlRelaxNGParse(parser); xmlRelaxNGFreeParserCtxt(parser); if (!sptr) { - php_error(E_WARNING, "Invalid RelaxNG"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid RelaxNG"); RETURN_FALSE; } @@ -2115,7 +2115,7 @@ } if (file_len == 0) { - php_error(E_WARNING, "Invalid Filename"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename"); RETURN_FALSE; } http://cvs.php.net/diff.php/php-src/ext/dom/domimplementation.c?r1=1.13&r2=1.14&ty=u Index: php-src/ext/dom/domimplementation.c diff -u php-src/ext/dom/domimplementation.c:1.13 php-src/ext/dom/domimplementation.c:1.14 --- php-src/ext/dom/domimplementation.c:1.13 Mon May 31 08:50:28 2004 +++ php-src/ext/dom/domimplementation.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementation.c,v 1.13 2004/05/31 12:50:28 rrichards Exp $ */ +/* $Id: domimplementation.c,v 1.14 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -201,7 +201,7 @@ xmlFreeDoc(docp); xmlFree(localname); /* Need some type of error here */ - php_error(E_WARNING, "Unexpected Error"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected Error"); RETURN_FALSE; } http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.34&r2=1.35&ty=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.34 php-src/ext/dom/node.c:1.35 --- php-src/ext/dom/node.c:1.34 Mon Apr 18 19:07:49 2005 +++ php-src/ext/dom/node.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.34 2005/04/18 23:07:49 rrichards Exp $ */ +/* $Id: node.c,v 1.35 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -317,7 +317,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(nodeparent, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -389,7 +389,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(first, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -427,7 +427,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(last, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -462,7 +462,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(prevsib, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -497,7 +497,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object(nextsib, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -573,7 +573,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -1299,7 +1299,7 @@ if (new_child == NULL) { new_child = xmlAddChild(nodep, child); if (new_child == NULL) { - php_error(E_WARNING, "Couldn't append node"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't append node"); RETURN_FALSE; } } http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.68&r2=1.69&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.68 php-src/ext/dom/php_dom.c:1.69 --- php-src/ext/dom/php_dom.c:1.68 Wed Feb 9 06:46:43 2005 +++ php-src/ext/dom/php_dom.c Thu Apr 21 17:11:23 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.68 2005/02/09 11:46:43 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.69 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -346,11 +346,11 @@ if (nodep && nodeobj && (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE)) { DOM_RET_OBJ(rv, (xmlNodePtr) nodep, &ret, (dom_object *)nodeobj); } else { - php_error(E_WARNING, "Invalid Nodetype to import"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import"); RETURN_NULL(); } #else - php_error(E_WARNING, "SimpleXML support is not enabled"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SimpleXML support is not enabled"); return; #endif } http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.h?r1=1.26&r2=1.27&ty=u Index: php-src/ext/dom/php_dom.h diff -u php-src/ext/dom/php_dom.h:1.26 php-src/ext/dom/php_dom.h:1.27 --- php-src/ext/dom/php_dom.h:1.26 Sun Feb 20 17:01:24 2005 +++ php-src/ext/dom/php_dom.h Thu Apr 21 17:11:23 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.h,v 1.26 2005/02/20 22:01:24 rrichards Exp $ */ +/* $Id: php_dom.h,v 1.27 2005/04/21 21:11:23 iliaa Exp $ */ #ifndef PHP_DOM_H #define PHP_DOM_H @@ -119,7 +119,7 @@ #define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = (dom_object *)zend_object_store_get_object(__id TSRMLS_CC); \ if (__intern->ptr == NULL || !(__ptr = (__prtype)((php_libxml_node_ptr *)__intern->ptr)->node)) { \ - php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } http://cvs.php.net/diff.php/php-src/ext/dom/xml_common.h?r1=1.20&r2=1.21&ty=u Index: php-src/ext/dom/xml_common.h diff -u php-src/ext/dom/xml_common.h:1.20 php-src/ext/dom/xml_common.h:1.21 --- php-src/ext/dom/xml_common.h:1.20 Fri Aug 13 08:32:55 2004 +++ php-src/ext/dom/xml_common.h Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml_common.h,v 1.20 2004/08/13 12:32:55 chregu Exp $ */ +/* $Id: xml_common.h,v 1.21 2005/04/21 21:11:23 iliaa Exp $ */ #ifndef PHP_XML_COMMON_H #define PHP_XML_COMMON_H @@ -68,7 +68,7 @@ #define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = (php_libxml_node_object *)zend_object_store_get_object(__id TSRMLS_CC); \ if (__intern->node == NULL || !(__ptr = (__prtype)__intern->node->node)) { \ - php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } @@ -77,7 +77,7 @@ __intern = (php_libxml_node_object *)zend_object_store_get_object(__id TSRMLS_CC); \ if (__intern->document != NULL) { \ if (!(__ptr = (__prtype)__intern->document->ptr)) { \ - php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } \ @@ -85,13 +85,13 @@ #define DOM_RET_OBJ(zval, obj, ret, domobject) \ if (NULL == (zval = php_dom_create_object(obj, ret, zval, return_value, domobject TSRMLS_CC))) { \ - php_error(E_WARNING, "Cannot create required DOM object"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \ RETURN_FALSE; \ } #define DOM_GET_THIS(zval) \ if (NULL == (zval = getThis())) { \ - php_error(E_WARNING, "Underlying object missing"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \ RETURN_FALSE; \ } http://cvs.php.net/diff.php/php-src/ext/dom/xpath.c?r1=1.24&r2=1.25&ty=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.24 php-src/ext/dom/xpath.c:1.25 --- php-src/ext/dom/xpath.c:1.24 Thu Nov 18 14:54:30 2004 +++ php-src/ext/dom/xpath.c Thu Apr 21 17:11:23 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.24 2004/11/18 19:54:30 rrichards Exp $ */ +/* $Id: xpath.c,v 1.25 2005/04/21 21:11:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -96,7 +96,7 @@ ALLOC_ZVAL(*retval); if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, NULL, *retval, obj TSRMLS_CC))) { - php_error(E_WARNING, "Cannot create required DOM object"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); return FAILURE; } return SUCCESS; @@ -119,7 +119,7 @@ ctxp = (xmlXPathContextPtr) intern->ptr; if (ctxp == NULL) { - php_error(E_WARNING, "Invalid XPath Context"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context"); RETURN_FALSE; } @@ -159,13 +159,13 @@ ctxp = (xmlXPathContextPtr) intern->ptr; if (ctxp == NULL) { - php_error(E_WARNING, "Invalid XPath Context"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context"); RETURN_FALSE; } docp = (xmlDocPtr) ctxp->doc; if (docp == NULL) { - php_error(E_WARNING, "Invalid XPath Document Pointer"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Document Pointer"); RETURN_FALSE; } @@ -178,7 +178,7 @@ } if (nodep && docp != nodep->doc) { - php_error(E_WARNING, "Node From Wrong Document"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node From Wrong Document"); RETURN_FALSE; }