archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

if you pass NULL as the resource_type_name to zend_fetch_resource*&friends the functions will not print any warnings if the resource is not found!

Browse source
This commit is contained in:
Thies C. Arntzen 1999-09-22 09:46:44 +00:00
parent 8b4000f4cb
commit 5f3515652a
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Zend/zend_list.c
View file

@ -154,10 +154,12 @@ ZEND_API void *zend_fetch_resource_ex(zval *passed_id, int default_id, char *res
if (default_id==-1) { /* use id */ if (default_id==-1) { /* use id */
if (!passed_id) { if (!passed_id) {
zend_error(E_WARNING, "No %s resource supplied", resource_type_name); if (resource_type_name)
zend_error(E_WARNING, "No %s resource supplied", resource_type_name);
return NULL; return NULL;
} else if (passed_id->type != IS_RESOURCE) { } else if (passed_id->type != IS_RESOURCE) {
zend_error(E_WARNING, "Supplied argument is not a valid %s resource", resource_type_name); if (resource_type_name)
zend_error(E_WARNING, "Supplied argument is not a valid %s resource", resource_type_name);
return NULL; return NULL;
} }
id = passed_id->value.lval; id = passed_id->value.lval;
@ -167,7 +169,8 @@ ZEND_API void *zend_fetch_resource_ex(zval *passed_id, int default_id, char *res
resource = zend_list_find(id, &actual_resource_type); resource = zend_list_find(id, &actual_resource_type);
if (!resource) { if (!resource) {
zend_error(E_WARNING, "%d is not a valid %s resource", id, resource_type_name); if (resource_type_name)
zend_error(E_WARNING, "%d is not a valid %s resource", id, resource_type_name);
return NULL; return NULL;
} }