6 files changed, 13 insertions, 14 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3a91e5bcdf..a1119acb37 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2083,8 +2083,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
 					zend_hash_find(dest, string_key, string_key_len,
 								   (void **)&dest_entry) == SUCCESS) {
 					if (*src_entry == *dest_entry) {
-						zend_error(E_WARNING, "%s(): recursion detected",
-								   get_active_function_name(TSRMLS_C));
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected");
 						return 0;
 					}
 					SEPARATE_ZVAL(dest_entry);
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index da3f525d14..a6b2cef218 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -157,8 +157,8 @@ PHP_FUNCTION(assert)
 		compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC);
 		if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
 			efree(compiled_string_description);
-			zend_error(E_ERROR, "Failure evaluating code:\n%s", myeval);
-			/* zend_error() does not return in this case. */
+			php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failure evaluating code:\n%s", myeval);
+			/* php_error_docref() does not return in this case. */
 		}
 		efree(compiled_string_description);
 
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index b2d50d5032..6c9c1f0062 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -228,7 +228,7 @@ PHP_FUNCTION(get_browser)
 		case 0:
 			if (!PG(http_globals)[TRACK_VARS_SERVER]
 				|| zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &agent_name)==FAILURE) {
-				zend_error(E_WARNING, "HTTP_USER_AGENT variable is not set, cannot determine user agent name");
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "HTTP_USER_AGENT variable is not set, cannot determine user agent name");
 				RETURN_FALSE;
 			}
 			break;
diff --git a/ext/standard/html.c b/ext/standard/html.c
index c784deec60..2133ed8b71 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -703,7 +703,7 @@ PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *new
 
 				/* When we have MBCS entities in the tables above, this will need to handle it */
 				if (k > 0xff) {
-					zend_error(E_WARNING, "cannot yet handle MBCS in html_entity_decode()!");
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot yet handle MBCS!");
 				}
 				replacement[0] = k;
 				replacement[1] = '\0';
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 403fbed930..16a9561a77 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Mon Aug 19 22:01:10 2002 */
-#line 1 "var_unserializer.re"
+/* Generated by re2c 0.5 on Fri Jan 24 11:25:29 2003 */
+#line 1 "/home/rei/PHP_CVS/php5/ext/standard/var_unserializer.re"
 #include "php.h"
 #include "ext/standard/php_var.h"
 #include "php_incomplete_class.h"
@@ -357,7 +357,7 @@ yy14:
 #line 404
 	{
 	/* this is the case where we have less data than planned */
-	zend_error(E_NOTICE, "Unexpected end of serialized data");
+	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data");
 	return 0; /* not sure if it should be 0 or 1 here? */
 }
 yy15:	yych = *++YYCURSOR;
@@ -419,12 +419,12 @@ yy22:
 			ZVAL_STRING(arg_func_name, class_name, 1);
 				
 			if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) {
-				zend_error(E_WARNING, "'unserialize_callback_func' defined (%s) but not found", user_func->value.str.val);
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", user_func->value.str.val);
 				incomplete_class = 1;
 				ce = PHP_IC_ENTRY;
 			} else {
 				if (zend_hash_find(CG(class_table), class_name, len2 + 1, (void **) &ce) != SUCCESS) {
-					zend_error(E_WARNING, "'unserialize_callback_func' (%s) hasn't defined the class it was called for", user_func->value.str.val);
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "(%s) hasn't defined the class it was called for", user_func->value.str.val);
 					incomplete_class = 1;
 					ce = PHP_IC_ENTRY;
 				} else {
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 1e6dcd078c..0ef2425faf 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -367,12 +367,12 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 			ZVAL_STRING(arg_func_name, class_name, 1);
 				
 			if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) {
-				zend_error(E_WARNING, "'unserialize_callback_func' defined (%s) but not found", user_func->value.str.val);
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", user_func->value.str.val);
 				incomplete_class = 1;
 				ce = PHP_IC_ENTRY;
 			} else {
 				if (zend_hash_find(CG(class_table), class_name, len2 + 1, (void **) &ce) != SUCCESS) {
-					zend_error(E_WARNING, "'unserialize_callback_func' (%s) hasn't defined the class it was called for", user_func->value.str.val);
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "(%s) hasn't defined the class it was called for", user_func->value.str.val);
 					incomplete_class = 1;
 					ce = PHP_IC_ENTRY;
 				} else {
@@ -403,7 +403,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 
 "}" {
 	/* this is the case where we have less data than planned */
-	zend_error(E_NOTICE, "Unexpected end of serialized data");
+	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data");
 	return 0; /* not sure if it should be 0 or 1 here? */
 }