php_error() -> php_error_docref().

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index c844a310962be0018fe26033bc5afc85c1b7e723..3a2e0d11cb927ca0baa30efa93c827e1745aaf08 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -868,7 +868,7 @@ PHP_FUNCTION(curl_copy_handle)
 
        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;
        }
 

diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index b598c18a56af66bda46a3a5b262519fb64632236..8f17299953b16692bbcee7b39d3e88be41959089 100644 (file)
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -225,7 +225,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval **retval TSRMLS_DC)
        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;

diff --git a/ext/dom/document.c b/ext/dom/document.c
index 18c89d09268a1d5c8a644e00034236a2ea4137aa..6a973e2baca0a526b8cb15613d8b971919fb5f9d 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -113,7 +113,7 @@ int dom_document_doctype_read(dom_object *obj, zval **retval TSRMLS_DC)
 
        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 @@ int dom_document_document_element_read(dom_object *obj, zval **retval TSRMLS_DC)
 
        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 @@ PHP_FUNCTION(dom_document_save)
        }
 
        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 @@ PHP_FUNCTION(dom_document_savexml)
                }
                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 @@ PHP_FUNCTION(dom_document_savexml)
                        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 @@ _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
        }
 
        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 @@ _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
        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 @@ _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
        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 @@ _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
        }
 
        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 @@ _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
        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 @@ _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
        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 @@ PHP_FUNCTION(dom_document_save_html_file)
        }
 
        if (file_len == 0) {
-               php_error(E_WARNING, "Invalid Filename");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename");
                RETURN_FALSE;
        }
 

diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c
index 5669bca3d440471aa2139f1a289a54409d67a86a..f99c2f60f3d50abc976036abf4ee1622395617b5 100644 (file)
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@@ -201,7 +201,7 @@ PHP_METHOD(domimplementation, createDocument)
                        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;
                }
 

diff --git a/ext/dom/node.c b/ext/dom/node.c
index cba2f80b54d6767f03b1eda776ade44077ffe053..0fffde1b78e55db23403997385a8645028cc02a8 100644 (file)
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -317,7 +317,7 @@ int dom_node_parent_node_read(dom_object *obj, zval **retval TSRMLS_DC)
        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 @@ int dom_node_first_child_read(dom_object *obj, zval **retval TSRMLS_DC)
        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 @@ int dom_node_last_child_read(dom_object *obj, zval **retval TSRMLS_DC)
        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 @@ int dom_node_previous_sibling_read(dom_object *obj, zval **retval TSRMLS_DC)
        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 @@ int dom_node_next_sibling_read(dom_object *obj, zval **retval TSRMLS_DC)
        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 @@ int dom_node_owner_document_read(dom_object *obj, zval **retval TSRMLS_DC)
        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 @@ PHP_FUNCTION(dom_node_append_child)
        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;
                }
        }

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 6226dee5b6567f246c021554699810d059165a93..d56adf1f7b860d682ccafa3f796db573421e0cdf 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -346,11 +346,11 @@ PHP_FUNCTION(dom_import_simplexml)
        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
 }

diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index eb17dc5154c591a1f032e96347952b93739e63e8..0cf94a43f97ed6c86c5eb64760070c46dc5dad85 100644 (file)
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -119,7 +119,7 @@ entry = zend_register_internal_class_ex(&ce, parent_ce, NULL TSRMLS_CC);
 #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();\
        } \
 }

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
index 72f5442578b4dc9590e7a02a1a33b04cf198f4ea..6e0c23fccabd4493994f74f5fc0eea7a3dc6e8ed 100644 (file)
--- a/ext/dom/xml_common.h
+++ b/ext/dom/xml_common.h
@@ -68,7 +68,7 @@ PHP_DOM_EXPORT(xmlNodePtr) dom_object_get_node(dom_object *obj);
 #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 @@ PHP_DOM_EXPORT(xmlNodePtr) dom_object_get_node(dom_object *obj);
        __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 @@ PHP_DOM_EXPORT(xmlNodePtr) dom_object_get_node(dom_object *obj);
 
 #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; \
        }
 

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 766238b856122e31798f53c176d9b61f46d6adf1..3bf40dda137dec1e762e6d251e406952477de3a7 100644 (file)
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -96,7 +96,7 @@ int dom_xpath_document_read(dom_object *obj, zval **retval TSRMLS_DC)
 
        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 @@ PHP_FUNCTION(dom_xpath_register_ns)
 
        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 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) {
 
        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 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) {
        }
 
        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;
        }