cvs: php4 /ext/standard basic_functions.c file.c

helly Sun Aug 25 14:21:40 2002 EDT Modified files: /php4/ext/standard basic_functions.c file.c Log: improoved error messages Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.497 php4/ext/standard/basic_functions.c:1.498 --- php4/ext/standard/basic_functions.c:1.497 Fri Aug 23 21:19:27 2002 +++ php4/ext/standard/basic_functions.c Sun Aug 25 14:21:40 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.497 2002/08/24 01:19:27 helly Exp $ */ +/* $Id: basic_functions.c,v 1.498 2002/08/25 18:21:40 helly Exp $ */ #include "php.h" #include "php_streams.h" @@ -1574,7 +1574,7 @@ } 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 @@ 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); Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.248 php4/ext/standard/file.c:1.249 --- php4/ext/standard/file.c:1.248 Sun Aug 25 08:09:57 2002 +++ php4/ext/standard/file.c Sun Aug 25 14:21:40 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.248 2002/08/25 12:09:57 wez Exp $ */ +/* $Id: file.c,v 1.249 2002/08/25 18:21:40 helly Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1513,7 +1513,7 @@ 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 @@ 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 @@ 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 @@ 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 */