cvs: php4 /ext/standard type.c
| From: | Derick Rethans | Date: | Mon, 08 Jul 2002 11:52:57 +0000 |
| Subject: | cvs: php4 /ext/standard type.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12749@lists.php.net to get a copy of this message | ||
derick Mon Jul 8 07:52:57 2002 EDT
Modified files:
/php4/ext/standard type.c
Log:
Unify error messages
Index: php4/ext/standard/type.c
diff -u php4/ext/standard/type.c:1.16 php4/ext/standard/type.c:1.17
--- php4/ext/standard/type.c:1.16 Mon Jul 8 07:50:01 2002
+++ php4/ext/standard/type.c Mon Jul 8 07:52:57 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: type.c,v 1.16 2002/07/08 11:50:01 derick Exp $ */
+/* $Id: type.c,v 1.17 2002/07/08 11:52:57 derick Exp $ */
#include "php.h"
@@ -115,10 +115,10 @@
} else if (!strcasecmp(new_type, "null")) {
convert_to_null(*var);
} else if (!strcasecmp(new_type, "resource")) {
- php_error(E_WARNING, "settype: cannot convert to resource type");
+ php_error(E_WARNING, "%s(): Cannot convert to resource type", get_active_function_name
(TSRMLS_C));
RETURN_FALSE;
} else {
- php_error(E_WARNING, "settype: invalid type");
+ php_error(E_WARNING, "%s(): Invalid type", get_active_function_name (TSRMLS_C));
RETURN_FALSE;
}
RETVAL_TRUE;