diff options
| author | Zeev Suraski <zeev@php.net> | 1999-09-24 14:03:45 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-09-24 14:03:45 +0000 |
| commit | 85844ace9593ce5b908da59f61f3a66b28d1ef00 (patch) | |
| tree | 4015e1de2c0cc35e3a0bc7a6167bba29dabd5fad | |
| parent | c8ac4bb0694e8111c28f0017ca9223d3fff00b00 (diff) | |
| download | php-git-85844ace9593ce5b908da59f61f3a66b28d1ef00.tar.gz | |
Exify the standardized resource stuff
| -rw-r--r-- | Zend/zend_list.c | 14 | ||||
| -rw-r--r-- | Zend/zend_list.h | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index ddc215ce4f..88784b10cd 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -138,13 +138,13 @@ ZEND_API void *zend_plist_find(int id, int *type) } -ZEND_API void *zend_fetch_resource(zval *passed_id, int default_id, char *resource_type_name, int resource_type) +ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resource_type_name, int resource_type) { return zend_fetch_resource_ex(passed_id, default_id, resource_type_name, 1, resource_type); } -ZEND_API void *zend_fetch_resource_ex(zval *passed_id, int default_id, char *resource_type_name, int num_resource_types, ...) +ZEND_API void *zend_fetch_resource_ex(zval **passed_id, int default_id, char *resource_type_name, int num_resource_types, ...) { int id; int actual_resource_type; @@ -154,15 +154,17 @@ ZEND_API void *zend_fetch_resource_ex(zval *passed_id, int default_id, char *res if (default_id==-1) { /* use id */ if (!passed_id) { - if (resource_type_name) + if (resource_type_name) { zend_error(E_WARNING, "No %s resource supplied", resource_type_name); + } return NULL; - } else if (passed_id->type != IS_RESOURCE) { - if (resource_type_name) + } 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); + } return NULL; } - id = passed_id->value.lval; + id = (*passed_id)->value.lval; } else { id = default_id; } diff --git a/Zend/zend_list.h b/Zend/zend_list.h index 3f81a78acc..04ae0c9dac 100644 --- a/Zend/zend_list.h +++ b/Zend/zend_list.h @@ -62,8 +62,8 @@ ZEND_API int zend_list_delete(int id); ZEND_API int zend_plist_delete(int id); ZEND_API void *zend_list_find(int id, int *type); ZEND_API void *zend_plist_find(int id, int *type); -ZEND_API void *zend_fetch_resource(zval *passed_id, int default_id, char *resource_type_name, int resource_type); -ZEND_API void *zend_fetch_resource_ex(zval *passed_id, int default_id, char *resource_type_name, int num_resource_types, ...); +ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resource_type_name, int resource_type); +ZEND_API void *zend_fetch_resource_ex(zval **passed_id, int default_id, char *resource_type_name, int num_resource_types, ...); extern ZEND_API int le_index_ptr; /* list entry type for index pointers */ |