diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
| commit | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (patch) | |
| tree | f5ded37abc65e64e270b6f1ac264db9bc603f949 /Zend/zend_list.c | |
| parent | cf7e703813e065fec7a8a5caa7aff4b70d3455b8 (diff) | |
| parent | 54d9ad53f4797733b41bf2c65bd2c2cb5a1938b6 (diff) | |
| download | php-git-e48b9ad197b4ec6ac72e75538453cc350d0a41f4.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_list.c')
| -rw-r--r-- | Zend/zend_list.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 5521964588..acd756bc99 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -315,15 +315,12 @@ ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_fu ZEND_API int zend_fetch_list_dtor_id(const char *type_name) { zend_rsrc_list_dtors_entry *lde; - HashPosition pos; - zend_hash_internal_pointer_reset_ex(&list_destructors, &pos); - while ((lde = zend_hash_get_current_data_ptr_ex(&list_destructors, &pos)) != NULL) { + ZEND_HASH_FOREACH_PTR(&list_destructors, lde) { if (lde->type_name && (strcmp(type_name, lde->type_name) == 0)) { return lde->resource_id; } - zend_hash_move_forward_ex(&list_destructors, &pos); - } + } ZEND_HASH_FOREACH_END(); return 0; } |