cellog          Thu Sep 11 03:33:10 2008 UTC

  Modified files:              
    /php-src/ext/phar   util.c 
  Log:
  remove weird relic of development past that somehow made it in here on the 
last commit
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.62 php-src/ext/phar/util.c:1.63
--- php-src/ext/phar/util.c:1.62        Thu Sep 11 03:29:42 2008
+++ php-src/ext/phar/util.c     Thu Sep 11 03:33:10 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: util.c,v 1.62 2008/09/11 03:29:42 cellog Exp $ */
+/* $Id: util.c,v 1.63 2008/09/11 03:33:10 cellog Exp $ */
 
 #include "phar_internal.h"
 
@@ -1186,10 +1186,6 @@
 }
 /* }}} */
 
-static int phar_retrieve_apc(fname, fname_len, archive)
-{
-}
-
 /**
  * Looks up a phar archive in the filename map, connecting it to the alias
  * (if any) or returns null
@@ -1385,18 +1381,11 @@
 
                        return SUCCESS;
                }
-<<<<<<< util.c
-               if (SUCCESS == phar_retrieve_apc(fname, fname_len, archive)) {
-                       efree(my_realpath);
-                       return SUCCESS;
-               }
-=======
 
                if (PHAR_G(manifest_cached) && SUCCESS == 
zend_hash_quick_find(&cached_phars, fname, fname_len, fhash, (void**)&fd_ptr)) {
                        goto realpath_success;
                }
 
->>>>>>> 1.60
                efree(my_realpath);
        }
 



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

Reply via email to