cvs: php4 /ext/domxml php_domxml.c

derick Wed Jun 26 03:54:01 2002 EDT Modified files: /php4/ext/domxml php_domxml.c Log: Unify error messages Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.176 php4/ext/domxml/php_domxml.c:1.177 --- php4/ext/domxml/php_domxml.c:1.176 Tue Jun 25 05:46:15 2002 +++ php4/ext/domxml/php_domxml.c Wed Jun 26 03:54:00 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.176 2002/06/25 09:46:15 chregu Exp $ */ +/* $Id: php_domxml.c,v 1.177 2002/06/26 07:54:00 derick Exp $ */ /* TODO * - Support Notation Nodes @@ -68,12 +68,12 @@ DOMXML_GET_OBJ(ret, zval, le); #define DOMXML_NO_ARGS() if (ZEND_NUM_ARGS() != 0) { \ - php_error(E_WARNING, "%s() expects exactly 0 parameters, %d given", \ + php_error(E_WARNING, "%s(): expects exactly 0 parameters, %d given", \ get_active_function_name(TSRMLS_C), ZEND_NUM_ARGS()); \ return; \ } -#define DOMXML_NOT_IMPLEMENTED() php_error(E_WARNING, "%s() not yet implemented", \ +#define DOMXML_NOT_IMPLEMENTED() php_error(E_WARNING, "%s(): not yet implemented", \ get_active_function_name(TSRMLS_C)); \ return; @@ -728,7 +728,7 @@ int type; if (NULL == wrapper) { - php_error(E_WARNING, "xsltstylesheet_get_object() invalid wrapper object passed"); + php_error(E_WARNING, "xsltstylesheet_get_object() invalid wrapper object passed", get_active_function_name(TSRMLS_C)); return NULL; } @@ -1049,7 +1049,7 @@ zend_hash_move_forward(parht)) { if (zend_hash_get_current_key(parht, &string_key, &num_key, 1) != HASH_KEY_IS_STRING) { - php_error(E_WARNING, "Invalid argument or parameter array to %s", + php_error(E_WARNING, "%s(): Invalid argument or parameter array", get_active_function_name(TSRMLS_C)); return NULL; } @@ -4277,7 +4277,7 @@ DOMXML_PARAM_TWO(parserp, id, le_domxmlparserp,"|s", &chunk, &chunk_len); error = xmlParseChunk(parserp, chunk, chunk_len, 1); if (error != 0) { - php_error(E_ERROR,"error: %d",error); + php_error(E_ERROR, "%s(): error: %d", get_active_function_name(TSRMLS_C), error); RETURN_FALSE; } if (parserp->myDoc != NULL) { @@ -4870,7 +4870,7 @@ if (xmlStrchr(string, '"')) { if (xmlStrchr(string, '\'')) { - php_error(E_WARNING, "Cannot create XPath expression (string contains both quote and double-quotes) in %s", + php_error(E_WARNING, "%s(): Cannot create XPath expression (string contains both quote and double-quotes)", get_active_function_name(TSRMLS_C)); return NULL; } @@ -4908,7 +4908,7 @@ zend_hash_move_forward(parht)) { if (zend_hash_get_current_key(parht, &string_key, &num_key, 1) != HASH_KEY_IS_STRING) { - php_error(E_WARNING, "Invalid argument or parameter array to %s", + php_error(E_WARNING, "%s(): Invalid argument or parameter array", get_active_function_name(TSRMLS_C)); return NULL; }