cvs: php-src(PHP_5_3) /ext/phar phar.phar util.c
| From: | Greg Beaver | Date: | Sun, 31 Aug 2008 19:42:16 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar phar.phar util.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52851@lists.php.net to get a copy of this message | ||
cellog Sun Aug 31 19:42:16 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.phar util.c
Log:
remove unnecessary double variable declarations
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.43&r2=1.7.2.44&diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.43 php-src/ext/phar/phar.phar:1.7.2.44
--- php-src/ext/phar/phar.phar:1.7.2.43 Sun Aug 31 07:15:25 2008
+++ php-src/ext/phar/phar.phar Sun Aug 31 19:42:16 2008
@@ -1171,8 +1171,8 @@
new PharCommand($argc, $argv);
__HALT_COMPILER(); ?>
-6-+6+
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸
Y
åBós.coîd!¨`w¡óLæȹBÀí.å[aäÙs\í¹
gß×
óbnáN@@ -1229,4 +1229,4 @@
ùUNøÖ þî_ê!@Îå°"¦ÚÚFóõOÿ¨ÊLG 3@§=DM¡bP½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îÓ á§¾óãæ]¢Õ~fI|øðP
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;pUµT°¬\ÍÏà騫éóÀ¨Ð }º{këáCz·« t8Ç6¬ò.ÑZ^ÂøIw®N$_ÿ¸@P
Ê¡ðÙÎö¯ØïÇBÏ
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.31&r2=1.55.2.32&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.31 php-src/ext/phar/util.c:1.55.2.32
--- php-src/ext/phar/util.c:1.55.2.31 Sun Aug 31 07:15:25 2008
+++ php-src/ext/phar/util.c Sun Aug 31 19:42:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: util.c,v 1.55.2.31 2008/08/31 07:15:25 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.32 2008/08/31 19:42:16 cellog Exp $ */
#include "phar_internal.h"
@@ -254,7 +254,7 @@
{
#if PHP_VERSION_ID >= 50300
char *path, *fname, *arch, *entry, *ret, *test;
- int arch_len, entry_len, fname_len;
+ int arch_len, entry_len, fname_len, ret_len;
phar_archive_data *phar;
if (pphar) {
@@ -322,9 +322,6 @@
efree(path);
if (ret && strlen(ret) > 8 && !strncmp(ret, "phar://", 7)) {
- char *arch;
- int arch_len, ret_len;
-
ret_len = strlen(ret);
/* found phar:// */