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

cellog Sun Aug 31 06:38:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.phar phar_object.c Log: merge minor optimization removing strlen from pecl/phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.38&r2=1.7.2.39&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.38 php-src/ext/phar/phar.phar:1.7.2.39 --- php-src/ext/phar/phar.phar:1.7.2.38 Sun Aug 31 06:31:53 2008 +++ php-src/ext/phar/phar.phar Sun Aug 31 06:38:09 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.41&r2=1.266.2.42&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.41 php-src/ext/phar/phar_object.c:1.266.2.42 --- php-src/ext/phar/phar_object.c:1.266.2.41 Sun Aug 31 06:31:53 2008 +++ php-src/ext/phar/phar_object.c Sun Aug 31 06:38:09 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.266.2.41 2008/08/31 06:31:53 cellog Exp $ */ +/* $Id: phar_object.c,v 1.266.2.42 2008/08/31 06:38:09 cellog Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -1984,6 +1984,7 @@ char *error; const char *pcr_error; int ext_len = ext ? strlen(ext) : 0; + int oldname_len; phar_archive_data **pphar = NULL; if (!ext) { @@ -2049,12 +2050,13 @@ oldpath = estrndup(phar->fname, phar->fname_len); oldname = zend_memrchr(phar->fname, '/', phar->fname_len); ++oldname; + oldname_len = strlen(oldname); - basename = estrndup(oldname, strlen(oldname)); + basename = estrndup(oldname, oldname_len); spprintf(&newname, 0, "%s.%s", strtok(basename, "."), ext); efree(basename); - basepath = estrndup(oldpath, strlen(oldpath) - strlen(oldname)); + basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len)); phar->fname_len = spprintf(&newpath, 0, "%s%s", basepath, newname); phar->fname = newpath; phar->ext = newpath + phar->fname_len - strlen(ext) - 1;