diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-02-02 14:45:19 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-02-02 14:45:19 +0800 |
| commit | e98caf27eaed852ee3567b1994167c85b89f79e5 (patch) | |
| tree | a91443579d8cc9c8c304e104a5b52c9cc89597cc /Zend/zend_list.c | |
| parent | 50ae5b31b4f88310f6941ee0ccc6e12b4792381e (diff) | |
| download | php-git-e98caf27eaed852ee3567b1994167c85b89f79e5.tar.gz | |
found type is unnecessary
Diffstat (limited to 'Zend/zend_list.c')
| -rw-r--r-- | Zend/zend_list.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 6344074d9c..2c653782ee 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -98,19 +98,13 @@ ZEND_API zend_resource* zend_register_resource(void *rsrc_pointer, int rsrc_type return Z_RES_P(zv); } -ZEND_API void *zend_fetch_resource2(zend_resource *res, const char *resource_type_name, int *found_type, int resource_type1, int resource_type2) +ZEND_API void *zend_fetch_resource2(zend_resource *res, const char *resource_type_name, int resource_type1, int resource_type2) { if (resource_type1 == res->type) { - if (found_type) { - *found_type = resource_type1; - } return res->ptr; } if (resource_type2 == res->type) { - if (found_type) { - *found_type = resource_type2; - } return res->ptr; } @@ -159,7 +153,7 @@ ZEND_API void *zend_fetch_resource_ex(zval *res, const char *resource_type_name, return zend_fetch_resource(Z_RES_P(res), resource_type_name, resource_type); } -ZEND_API void *zend_fetch_resource2_ex(zval *res, const char *resource_type_name, int *found_type, int resource_type1, int resource_type2) +ZEND_API void *zend_fetch_resource2_ex(zval *res, const char *resource_type_name, int resource_type1, int resource_type2) { const char *space, *class_name; if (res == NULL) { @@ -177,7 +171,7 @@ ZEND_API void *zend_fetch_resource2_ex(zval *res, const char *resource_type_name return NULL; } - return zend_fetch_resource2(Z_RES_P(res), resource_type_name, found_type, resource_type1, resource_type2); + return zend_fetch_resource2(Z_RES_P(res), resource_type_name, resource_type1, resource_type2); } void list_entry_destructor(zval *zv) |