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

cellog Sun Aug 31 06:58:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.phar phar_object.c Log: fix compile warning in PHP < 6.0 http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.41&r2=1.7.2.42&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.41 php-src/ext/phar/phar.phar:1.7.2.42 --- php-src/ext/phar/phar.phar:1.7.2.41 Sun Aug 31 06:51:49 2008 +++ php-src/ext/phar/phar.phar Sun Aug 31 06:58:04 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.43&r2=1.266.2.44&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.43 php-src/ext/phar/phar_object.c:1.266.2.44 --- php-src/ext/phar/phar_object.c:1.266.2.43 Sun Aug 31 06:42:46 2008 +++ php-src/ext/phar/phar_object.c Sun Aug 31 06:58:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.266.2.43 2008/08/31 06:42:46 cellog Exp $ */ +/* $Id: phar_object.c,v 1.266.2.44 2008/08/31 06:58:04 cellog Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -1448,7 +1448,12 @@ } if (key_type > 9) { /* IS_UNICODE == 10 */ +#if PHP_VERSION_ID < 60000 +/* this can never happen, but fixes a compile warning */ + spprintf(&str_key, 0, "%s", key); +#else spprintf(&str_key, 0, "%v", key); +#endif } else { PHAR_STR(key, str_key); } @@ -1575,7 +1580,12 @@ } if (key_type > 9) { /* IS_UNICODE == 10 */ +#if PHP_VERSION_ID < 60000 +/* this can never happen, but fixes a compile warning */ + spprintf(&str_key, 0, "%s", key); +#else spprintf(&str_key, 0, "%v", key); +#endif } else { PHAR_STR(key, str_key); }