cvs: php-src(PHP_5_3) /ext/phar phar.phar phar_object.c

cellog Sun Aug 31 06:31:53 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.phar phar_object.c Log: remove unused variables, merge from pecl/phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.37&r2=1.7.2.38&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.37 php-src/ext/phar/phar.phar:1.7.2.38 --- php-src/ext/phar/phar.phar:1.7.2.37 Sun Aug 31 06:28:01 2008 +++ php-src/ext/phar/phar.phar Sun Aug 31 06:31:53 2008 @@ -1171,8 +1171,8 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); ?> -6
-+6
+ ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹ gßœ× „ób„náNŸ@@ -1229,4 +1229,4 @@ ùU™NøÖ þ­î_ê!@Îå°"¦ÚڐFóõOÿ¨ÊLG3@§=DM¡bP½5ùâ ¬ËaYšº
[Ã⎬mòvOë<ý]¸¹)×soS…jßZæ/]ûô‚Þv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ŒÐӛ*€Çê=KÕO)ò)‘«Ë-ԍ]µLí‹·¡7µ¾Í¨.zÿ.jß?8Tù®,˜:«Äa·éï¤Á»hg• ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4ʃ¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,­°„í]@¿úÁëÀu8á3nã\WÊíÑ藵ïtúÎþ®øÚ÷Eí»ú¡ÃÏà›Ÿ‚ÇGx‰îӟ᧾óãæ]Ž¢Õ~f–I|øðP› j„7l1ØÛPšH†üéÅiGH¬5´¯’$ß/rªýëІ~ѐ›úgìªz²¢ÎÛ¦pu€Šùäûù;â9³™䂯;pUµ–T°¬\ÍÏà騫éóÀ¨Ð}º{këáCz·«t8Ǜ6
¬ò“.ÑZ^ÂøIw®N$_ÿ¸@P…Ê•¡ðÙÎö¯ØïÇBˆÏ -Pàø3C°\ No newline at end of file +Pàø3C°\ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.40&r2=1.266.2.41&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.40 php-src/ext/phar/phar_object.c:1.266.2.41 --- php-src/ext/phar/phar_object.c:1.266.2.40 Sun Aug 31 06:26:19 2008 +++ php-src/ext/phar/phar_object.c Sun Aug 31 06:31:53 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.266.2.40 2008/08/31 06:26:19 cellog Exp $ */ +/* $Id: phar_object.c,v 1.266.2.41 2008/08/31 06:31:53 cellog Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -1393,7 +1393,7 @@ { zval **value; zend_uchar key_type; - zend_bool is_splfileinfo = 0, close_fp = 1; + zend_bool close_fp = 1; ulong int_key; struct _phar_t *p_obj = (struct _phar_t*) puser; uint str_key_len, base_len = p_obj->l, fname_len; @@ -1505,7 +1505,6 @@ } save = fname; - is_splfileinfo = 1; goto phar_spl_fileinfo; case SPL_FS_INFO: case SPL_FS_FILE: @@ -1516,7 +1515,6 @@ #endif fname_len = strlen(fname); save = fname; - is_splfileinfo = 1; goto phar_spl_fileinfo; } }