Index: Zend/zend_list.c
===================================================================
RCS file: /repository/ZendEngine2/zend_list.c,v
retrieving revision 1.64
diff -u -p -d -r1.64 zend_list.c
--- Zend/zend_list.c	17 Feb 2004 22:04:05 -0000	1.64
+++ Zend/zend_list.c	17 Jun 2005 10:57:44 -0000
@@ -114,16 +114,20 @@ ZEND_API void *zend_fetch_resource(zval 
 	void *resource;
 	va_list resource_types;
 	int i;
+	char *space;
+	char *class_name;
 
 	if (default_id==-1) { /* use id */
 		if (!passed_id) {
 			if (resource_type_name) {
-				zend_error(E_WARNING, "%s(): no %s resource supplied", get_active_function_name(TSRMLS_C), resource_type_name);
+				class_name = get_active_class_name(&space TSRMLS_CC);
+				zend_error(E_WARNING, "%s%s%s(): no %s resource supplied", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
 			}
 			return NULL;
 		} else if ((*passed_id)->type != IS_RESOURCE) {
 			if (resource_type_name) {
-				zend_error(E_WARNING, "%s(): supplied argument is not a valid %s resource", get_active_function_name(TSRMLS_C), resource_type_name);
+				class_name = get_active_class_name(&space TSRMLS_CC);
+				zend_error(E_WARNING, "%s%s%s(): supplied argument is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
 			}
 			return NULL;
 		}
@@ -135,7 +139,8 @@ ZEND_API void *zend_fetch_resource(zval 
 	resource = zend_list_find(id, &actual_resource_type);
 	if (!resource) {
 		if (resource_type_name) {
-			zend_error(E_WARNING, "%s(): %d is not a valid %s resource", get_active_function_name(TSRMLS_C), id, resource_type_name);
+			class_name = get_active_class_name(&space TSRMLS_CC);
+			zend_error(E_WARNING, "%s%s%s(): %d is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), id, resource_type_name);
 		}
 		return NULL;
 	}
@@ -153,7 +158,8 @@ ZEND_API void *zend_fetch_resource(zval 
 	va_end(resource_types);
 
 	if (resource_type_name) {
-		zend_error(E_WARNING, "%s(): supplied resource is not a valid %s resource", get_active_function_name(TSRMLS_C), resource_type_name);
+		class_name = get_active_class_name(&space TSRMLS_CC);
+		zend_error(E_WARNING, "%s%s%s(): supplied resource is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
 	}
 
 	return NULL;
Index: Zend/zend_API.c
===================================================================
RCS file: /repository/ZendEngine2/zend_API.c,v
retrieving revision 1.285
diff -u -p -d -r1.285 zend_API.c
--- Zend/zend_API.c	29 Apr 2005 07:59:03 -0000	1.285
+++ Zend/zend_API.c	17 Jun 2005 10:57:44 -0000
@@ -197,7 +197,10 @@ ZEND_API int zend_copy_parameters_array(
 
 ZEND_API void zend_wrong_param_count(TSRMLS_D)
 {
-	zend_error(E_WARNING, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C));
+	char *space;
+	char *class_name = get_active_class_name(&space TSRMLS_CC);
+	
+	zend_error(E_WARNING, "Wrong parameter count for %s%s%s()", class_name, space, get_active_function_name(TSRMLS_C));
 }
 
 
@@ -488,8 +491,11 @@ static int zend_parse_arg(int arg_num, z
 	expected_type = zend_parse_arg_impl(arg, va, spec TSRMLS_CC);
 	if (expected_type) {
 		if (!quiet) {
-			zend_error(E_WARNING, "%s() expects parameter %d to be %s, %s given",
-					get_active_function_name(TSRMLS_C), arg_num, expected_type,
+			char *space;
+			char *class_name = get_active_class_name(&space TSRMLS_CC);
+
+			zend_error(E_WARNING, "%s%s%s() expects parameter %d to be %s, %s given",
+					class_name, space, get_active_function_name(TSRMLS_C), arg_num, expected_type,
 					zend_zval_type_name(*arg));
 		}
 		return FAILURE;