diff options
| author | Nikita Popov <nikic@php.net> | 2013-09-13 21:21:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2013-09-13 21:49:09 +0200 |
| commit | e6b228332f3cd7b9e3a5f3ba8a8e08ae1b01abdf (patch) | |
| tree | 2f0dd3650c3ff683ad84fda2c1fd27b392fb2de9 /ext/phar/util.c | |
| parent | 39bd738fbffb1270494e3724a7f9d52b409c56dd (diff) | |
| download | php-git-e6b228332f3cd7b9e3a5f3ba8a8e08ae1b01abdf.tar.gz | |
Remove PHAR_(Z)STR* usages
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index e115d0d584..bf094aff87 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1289,21 +1289,17 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in } if (phar->mounted_dirs.arBuckets && zend_hash_num_elements(&phar->mounted_dirs)) { - phar_zstr key; char *str_key; ulong unused; uint keylen; zend_hash_internal_pointer_reset(&phar->mounted_dirs); while (FAILURE != zend_hash_has_more_elements(&phar->mounted_dirs)) { - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(&phar->mounted_dirs, &key, &keylen, &unused, 0, NULL)) { + if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(&phar->mounted_dirs, &str_key, &keylen, &unused, 0, NULL)) { break; } - PHAR_STR(key, str_key); - if ((int)keylen >= path_len || strncmp(str_key, path, keylen)) { - PHAR_STR_FREE(str_key); continue; } else { char *test; @@ -1314,7 +1310,6 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in if (error) { spprintf(error, 4096, "phar internal error: mounted path \"%s\" could not be retrieved from manifest", str_key); } - PHAR_STR_FREE(str_key); return NULL; } @@ -1322,10 +1317,8 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in if (error) { spprintf(error, 4096, "phar internal error: mounted path \"%s\" is not properly initialized as a mounted path", str_key); } - PHAR_STR_FREE(str_key); return NULL; } - PHAR_STR_FREE(str_key); test_len = spprintf(&test, MAXPATHLEN, "%s%s", entry->tmp, path + keylen); |