Skip to content

Commit 37d9689

Browse files
committed
ext/phar: remove save variable in phar_get_archive()
It serves no purpose as fname is never modified so there is nothing to restore. Just use fname directly instead.
1 parent 3a9d7b5 commit 37d9689

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

ext/phar/util.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,9 +1035,6 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
10351035
}
10361036
}
10371037

1038-
const char *save = fname;
1039-
size_t save_len = fname_len;
1040-
10411038
if (fname && fname_len) {
10421039
fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_fname_map)), fname, fname_len);
10431040
if (fd_ptr) {
@@ -1090,7 +1087,7 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
10901087
return SUCCESS;
10911088
}
10921089

1093-
fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), save, save_len);
1090+
fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), fname, fname_len);
10941091
if (fd_ptr) {
10951092
fd = *archive = fd_ptr;
10961093

@@ -1102,7 +1099,7 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
11021099
return SUCCESS;
11031100
}
11041101

1105-
if (PHAR_G(manifest_cached) && NULL != (fd_ptr = zend_hash_str_find_ptr(&cached_alias, save, save_len))) {
1102+
if (PHAR_G(manifest_cached) && NULL != (fd_ptr = zend_hash_str_find_ptr(&cached_alias, fname, fname_len))) {
11061103
fd = *archive = fd_ptr;
11071104

11081105
PHAR_G(last_phar) = fd;

0 commit comments

Comments
 (0)