diff options
| author | Derick Rethans <derick@php.net> | 2002-01-03 14:19:13 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-01-03 14:19:13 +0000 |
| commit | 9b391a83c2f06e4e2185ab37d1427b70e48fc94f (patch) | |
| tree | 8214d494aaa1a7789590a821bd7d30fbcd9be8ea /Zend/zend_list.c | |
| parent | 7f428de3700d7b68aa31f2f0dac75c7ff8406998 (diff) | |
| download | php-git-9b391a83c2f06e4e2185ab37d1427b70e48fc94f.tar.gz | |
- MFZE1 for exit fix, exposing current function name in error messages and
exposing zend_zval_type_name().
Diffstat (limited to 'Zend/zend_list.c')
| -rw-r--r-- | Zend/zend_list.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 5ca3c930d8..d27d4ebd9d 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -117,12 +117,12 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c if (default_id==-1) { /* use id */ if (!passed_id) { if (resource_type_name) { - zend_error(E_WARNING, "No %s resource supplied", resource_type_name); + zend_error(E_WARNING, "%s(): no %s resource supplied", 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, "Supplied argument is not a valid %s resource", 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); } return NULL; } @@ -134,7 +134,7 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c resource = zend_list_find(id, &actual_resource_type); if (!resource) { if (resource_type_name) { - zend_error(E_WARNING, "%d is not a valid %s resource", id, 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); } return NULL; } @@ -152,7 +152,7 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c va_end(resource_types); if (resource_type_name) { - zend_error(E_WARNING, "Supplied resource is not a valid %s resource", 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); } return NULL; |