diff options
| author | Nikita Popov <nikic@php.net> | 2014-12-23 22:00:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-12-26 21:06:18 +0100 |
| commit | 2d212b426a22c9d9f357be0a6832ced9a3fff073 (patch) | |
| tree | f1d0ec807cca7add558b6282b85e136e2e5a9bfd /ext/phar | |
| parent | 3d12fc796b0048ab498f82ac497476129a7976e7 (diff) | |
| download | php-git-2d212b426a22c9d9f357be0a6832ced9a3fff073.tar.gz | |
Drop duplicate arg from hash_get_current_key_ex
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/dirstream.c | 11 | ||||
| -rw-r--r-- | ext/phar/phar.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index 33a3cd20c2..8657abda92 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -97,7 +97,7 @@ static size_t phar_dir_read(php_stream *stream, char *buf, size_t count) /* {{{ zend_string *str_key; zend_ulong unused; - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(data, &str_key, &unused, 0, &data->nInternalPointer)) { + if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key(data, &str_key, &unused)) { return 0; } @@ -199,7 +199,7 @@ static php_stream *phar_make_dirstream(char *dir, HashTable *manifest) /* {{{ */ zend_hash_internal_pointer_reset(manifest); while (FAILURE != zend_hash_has_more_elements(manifest)) { - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &str_key, &unused, 0, &manifest->nInternalPointer)) { + if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key(manifest, &str_key, &unused)) { break; } @@ -384,8 +384,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, const char *path, zend_hash_internal_pointer_reset(&phar->manifest); while (FAILURE != zend_hash_has_more_elements(&phar->manifest)) { if (HASH_KEY_NON_EXISTENT != - zend_hash_get_current_key_ex( - &phar->manifest, &str_key, &unused, 0, &phar->manifest.nInternalPointer)) { + zend_hash_get_current_key(&phar->manifest, &str_key, &unused)) { if (str_key->len > (uint)i_len && 0 == memcmp(str_key->val, internal_file, i_len)) { /* directory found */ internal_file = estrndup(internal_file, @@ -612,7 +611,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, int options if (!entry->is_deleted) { for (zend_hash_internal_pointer_reset(&phar->manifest); - HASH_KEY_NON_EXISTENT != zend_hash_get_current_key_ex(&phar->manifest, &str_key, &unused, 0, &phar->manifest.nInternalPointer); + HASH_KEY_NON_EXISTENT != zend_hash_get_current_key(&phar->manifest, &str_key, &unused); zend_hash_move_forward(&phar->manifest) ) { if (str_key->len > path_len && @@ -629,7 +628,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, int options } for (zend_hash_internal_pointer_reset(&phar->virtual_dirs); - HASH_KEY_NON_EXISTENT != zend_hash_get_current_key_ex(&phar->virtual_dirs, &str_key, &unused, 0, &phar->virtual_dirs.nInternalPointer); + HASH_KEY_NON_EXISTENT != zend_hash_get_current_key(&phar->virtual_dirs, &str_key, &unused); zend_hash_move_forward(&phar->virtual_dirs)) { if (str_key->len > path_len && diff --git a/ext/phar/phar.c b/ext/phar/phar.c index b601669507..d4a5f3a3fe 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1960,7 +1960,7 @@ woohoo: zend_ulong unused; for (zend_hash_internal_pointer_reset(&(PHAR_GLOBALS->phar_fname_map)); - HASH_KEY_NON_EXISTENT != zend_hash_get_current_key_ex(&(PHAR_GLOBALS->phar_fname_map), &str_key, &unused, 0, &PHAR_GLOBALS->phar_fname_map.nInternalPointer); + HASH_KEY_NON_EXISTENT != zend_hash_get_current_key(&(PHAR_GLOBALS->phar_fname_map), &str_key, &unused); zend_hash_move_forward(&(PHAR_GLOBALS->phar_fname_map)) ) { if (str_key->len > (uint) filename_len) { @@ -1979,7 +1979,7 @@ woohoo: if (PHAR_G(manifest_cached)) { for (zend_hash_internal_pointer_reset(&cached_phars); - HASH_KEY_NON_EXISTENT != zend_hash_get_current_key_ex(&cached_phars, &str_key, &unused, 0, &cached_phars.nInternalPointer); + HASH_KEY_NON_EXISTENT != zend_hash_get_current_key(&cached_phars, &str_key, &unused); zend_hash_move_forward(&cached_phars) ) { if (str_key->len > (uint) filename_len) { |