cellog          Sun Aug 31 06:05:20 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   func_interceptors.c phar.phar 
  Log:
  remove unused variables, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.15&r2=1.20.2.16&diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.15 
php-src/ext/phar/func_interceptors.c:1.20.2.16
--- php-src/ext/phar/func_interceptors.c:1.20.2.15      Sun Aug 31 06:04:38 2008
+++ php-src/ext/phar/func_interceptors.c        Sun Aug 31 06:05:20 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.15 2008/08/31 06:04:38 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.16 2008/08/31 06:05:20 cellog Exp $ */
 
 #include "phar_internal.h"
 
@@ -681,16 +681,12 @@
 #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 @@
                                        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 @@
                                        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 @@
                                PHAR_G(cwd) = save;
                                PHAR_G(cwd_len) = save_len;
                                efree(entry);
-                               efree(save2);
                                efree(arch);
                                /* Error Occured */
                                if (!IS_EXISTS_CHECK(type)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.33&r2=1.7.2.34&diff_format=u
Index: php-src/ext/phar/phar.phar



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to