remove unused variables, merge from pecl/phar

diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index 0c9811aaa498cbd1a6896e73b31a7fb9f9b17f15..80d4312bd201937b90052781e53fc22f5c894356 100644 (file)
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -681,16 +681,12 @@ splitted:
 #endif
                                goto statme_baby;
                        } else {
-                               char *save, *save2, *actual;
-                               int save_len, save2_len, actual_len;
+                               char *save;
+                               int save_len;
 
 notfound:
                                save = PHAR_G(cwd);
-                               save2 = entry;
-                               actual = entry[0] == '/' ? (entry + 1) : entry;
                                save_len = PHAR_G(cwd_len);
-                               save2_len = entry_len;
-                               actual_len = entry[0] == '/' ? (entry_len - 1) : entry_len;
                                /* this file is not in the current directory, use the original path */
                                entry = estrndup(filename, filename_length);
                                entry_len = filename_length;
@@ -702,7 +698,6 @@ notfound:
                                        PHAR_G(cwd) = save;
                                        PHAR_G(cwd_len) = save_len;
                                        efree(entry);
-                                       efree(save2);
                                        if (IS_EXISTS_CHECK(type)) {
                                                efree(arch);
                                                RETURN_TRUE;
@@ -713,7 +708,6 @@ notfound:
                                        PHAR_G(cwd) = save;
                                        PHAR_G(cwd_len) = save_len;
                                        efree(entry);
-                                       efree(save2);
                                        efree(arch);
                                        if (IS_EXISTS_CHECK(type)) {
                                                RETURN_TRUE;
@@ -735,7 +729,6 @@ notfound:
                                PHAR_G(cwd) = save;
                                PHAR_G(cwd_len) = save_len;
                                efree(entry);
-                               efree(save2);
                                efree(arch);
                                /* Error Occured */
                                if (!IS_EXISTS_CHECK(type)) {

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 2da7a948ff7ad4c924b1d87ab779a4e325ff4dca..0fda271713ff552e5e4409020f9b0c6f8fa5b97b 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2305,7 +2305,6 @@ int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_le
 int phar_open_executed_filename(char *alias, int alias_len, char **error TSRMLS_DC) /* {{{ */
 {
        char *fname;
-       long halt_offset;
        zval *halt_constant;
        php_stream *fp;
        int fname_len;
@@ -2340,7 +2339,6 @@ int phar_open_executed_filename(char *alias, int alias_len, char **error TSRMLS_
                return FAILURE;
        }
 
-       halt_offset = Z_LVAL(*halt_constant);
        FREE_ZVAL(halt_constant);
 
 #if PHP_MAJOR_VERSION < 6

diff --git a/ext/phar/phar.phar b/ext/phar/phar.phar
index 06cbf51a1f338a0c50dfaaa4be9130c67e4a686b..dae26d8a349c5bb02ab90a800f44bc956db46973 100755 (executable)
Binary files a/ext/phar/phar.phar and b/ext/phar/phar.phar differ