improoved error messages

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 1c66aee6d07a02a401713618c0e3632912eefc9c..b87c647c2aba62c98d0a9f789eca51ff705ad1bb 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1574,7 +1574,7 @@ PHP_FUNCTION(call_user_func)
        }
 
        if (!zend_is_callable(*params[0], 0, &name)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argumented is expected to be a valid callback, '%s' was given", name);
+               php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "First argumented is expected to be a valid callback");
                efree(name);
                efree(params);
                RETURN_NULL();
@@ -1583,7 +1583,19 @@ PHP_FUNCTION(call_user_func)
        if (call_user_function_ex(EG(function_table), NULL, *params[0], &retval_ptr, argc-1, params+1, 0, NULL TSRMLS_CC) == SUCCESS && retval_ptr) {
                COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
        } else {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call %s()", name);
+               if (argc>1) {
+                       SEPARATE_ZVAL(params[1]);
+                       convert_to_string_ex(params[1]);
+                       if (argc>2) {
+                               SEPARATE_ZVAL(params[2]);
+                               convert_to_string_ex(params[2]);
+                               php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "Unable to call %s(%s,%s)", name, Z_STRVAL_PP(params[1]), Z_STRVAL_PP(params[2]));
+                       } else {
+                               php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "Unable to call %s(%s)", name, Z_STRVAL_PP(params[1]));
+                       }
+               } else {
+                       php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "Unable to call %s()", name);
+               }
        }
 
        efree(name);

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 456523f75266277d5c413b9a8d3d530c5afb000d..d02e86d5ca448a4b0bd623aa82ef0741a2969112 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1513,7 +1513,7 @@ PHP_FUNCTION(mkdir)
 
        ret = VCWD_MKDIR(dir, (mode_t)mode);
        if (ret < 0) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               php_error_docref1(NULL TSRMLS_CC, dir, E_WARNING, "%s", strerror(errno));
                RETURN_FALSE;
        }
        RETURN_TRUE;
@@ -1543,7 +1543,7 @@ PHP_FUNCTION(rmdir)
 
        ret = VCWD_RMDIR(Z_STRVAL_PP(arg1));
        if (ret < 0) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               php_error_docref1(NULL TSRMLS_CC, Z_STRVAL_PP(arg1), E_WARNING, "%s", strerror(errno));
                RETURN_FALSE;
        }
 
@@ -1670,7 +1670,7 @@ PHP_FUNCTION(rename)
        ret = VCWD_RENAME(old_name, new_name);
 
        if (ret == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               php_error_docref2(NULL TSRMLS_CC, old_name, new_name, E_WARNING, "%s", strerror(errno));
                RETURN_FALSE;
        }
 
@@ -1700,7 +1700,7 @@ PHP_FUNCTION(unlink)
 
        ret = VCWD_UNLINK(Z_STRVAL_PP(filename));
        if (ret == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               php_error_docref1(NULL TSRMLS_CC, Z_STRVAL_PP(filename), E_WARNING, "%s", strerror(errno));
                RETURN_FALSE;
        }
        /* Clear stat cache */