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

cellog Sun Aug 31 06:51:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.phar tar.c Log: remove superfluous variable declarations, merge WS from pecl/phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.40&r2=1.7.2.41&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.40 php-src/ext/phar/phar.phar:1.7.2.41 --- php-src/ext/phar/phar.phar:1.7.2.40 Sun Aug 31 06:47:38 2008 +++ php-src/ext/phar/phar.phar Sun Aug 31 06:51:49 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/tar.c?r1=1.55.2.18&r2=1.55.2.19&diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.18 php-src/ext/phar/tar.c:1.55.2.19 --- php-src/ext/phar/tar.c:1.55.2.18 Fri Aug 1 13:48:45 2008 +++ php-src/ext/phar/tar.c Sun Aug 31 06:51:49 2008 @@ -255,7 +255,6 @@ phar_tar_number(hdr->size, sizeof(hdr->size)); if (((!old && hdr->prefix[0] == 0) || old) && strlen(hdr->name) == sizeof(".phar/signature.bin")-1 && !strncmp(hdr->name, ".phar/signature.bin", sizeof(".phar/signature.bin")-1)) { - size_t read; if (size > 511) { if (error) { spprintf(error, 4096, "phar error: tar-based phar \"%s\" has signature that is larger than 511 bytes, cannot process", fname); @@ -370,7 +369,7 @@ return FAILURE; } - entry.tar_type = ((old & (hdr->typeflag == 0))?'0':hdr->typeflag); + entry.tar_type = ((old & (hdr->typeflag == 0)) ? '0' : hdr->typeflag); entry.offset = entry.offset_abs = pos; /* header_offset unused in tar */ entry.fp_type = PHAR_FP; entry.flags = phar_tar_number(hdr->mode, sizeof(hdr->mode)) & PHAR_ENT_PERM_MASK; @@ -424,7 +423,6 @@ } if (!actual_alias && entry.filename_len == sizeof(".phar/alias.txt")-1 && !strncmp(entry.filename, ".phar/alias.txt", sizeof(".phar/alias.txt")-1)) { - size_t read; /* found explicit alias */ if (size > 511) { if (error) {