cvs: php-src(PHP_5_0) /ext/simplexml php_simplexml_exports.h simplexml.c

iliaa Thu Aug 5 19:57:53 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/simplexml php_simplexml_exports.h simplexml.c Log: MFH: php_error() -> php_error_docref() http://cvs.php.net/diff.php/php-src/ext/simplexml/php_simplexml_exports.h?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/simplexml/php_simplexml_exports.h diff -u php-src/ext/simplexml/php_simplexml_exports.h:1.1 php-src/ext/simplexml/php_simplexml_exports.h:1.1.2.1 --- php-src/ext/simplexml/php_simplexml_exports.h:1.1 Sun Jan 18 18:35:12 2004 +++ php-src/ext/simplexml/php_simplexml_exports.h Thu Aug 5 19:57:53 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_simplexml_exports.h,v 1.1 2004/01/18 23:35:12 helly Exp $ */ +/* $Id: php_simplexml_exports.h,v 1.1.2.1 2004/08/05 23:57:53 iliaa Exp $ */ #ifndef PHP_SIMPLEXML_EXPORTS_H #define PHP_SIMPLEXML_EXPORTS_H @@ -35,7 +35,7 @@ __n = (__s)->node->node; \ } else { \ __n = NULL; \ - php_error(E_WARNING, "Node no longer exists"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node no longer exists"); \ } \ } http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.139.2.1&r2=1.139.2.2&ty=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.139.2.1 php-src/ext/simplexml/simplexml.c:1.139.2.2 --- php-src/ext/simplexml/simplexml.c:1.139.2.1 Wed Aug 4 10:40:53 2004 +++ php-src/ext/simplexml/simplexml.c Thu Aug 5 19:57:53 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.139.2.1 2004/08/04 14:40:53 zeev Exp $ */ +/* $Id: simplexml.c,v 1.139.2.2 2004/08/05 23:57:53 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -92,7 +92,7 @@ __n = (__s)->node->node; \ } else { \ __n = NULL; \ - php_error(E_WARNING, "Node no longer exists"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node no longer exists"); \ } \ } @@ -295,7 +295,7 @@ } break; default: - php_error(E_WARNING, "It is not possible to assign complex types to nodes"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not possible to assign complex types to nodes"); break; } } @@ -420,7 +420,7 @@ } change_node_zval(newnode, value); } else if (counter > 1) { - php_error(E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)\n"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)\n"); } else { if (attribs) { switch (Z_TYPE_P(value)) { @@ -433,7 +433,7 @@ newnode = (xmlNodePtr)xmlNewProp(node, name, Z_STRVAL_P(value)); break; default: - php_error(E_WARNING, "It is not yet possible to assign complex types to attributes"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not yet possible to assign complex types to attributes"); } } } @@ -1545,7 +1545,7 @@ if (nodep) { if (nodep->doc == NULL) { - php_error(E_WARNING, "Imported Node must have associated Document"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Imported Node must have associated Document"); RETURN_NULL(); } if (nodep->type == XML_DOCUMENT_NODE || nodep->type == XML_HTML_DOCUMENT_NODE) { @@ -1570,7 +1570,7 @@ return_value->type = IS_OBJECT; return_value->value.obj = php_sxe_register_object(sxe TSRMLS_CC); } else { - php_error(E_WARNING, "Invalid Nodetype to import"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import"); RETVAL_NULL(); } } @@ -1656,7 +1656,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.139.2.1 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.139.2.2 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled");