From 1c66670ee8af64760d479da21fa40940eeb7d9ce Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Sun, 31 Aug 2008 06:38:09 +0000 Subject: [PATCH] merge minor optimization removing strlen from pecl/phar --- ext/phar/phar.phar | 6 +++--- ext/phar/phar_object.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ext/phar/phar.phar b/ext/phar/phar.phar index 56469b35ba..ab748ede1a 100755 --- a/ext/phar/phar.phar +++ b/ext/phar/phar.phar @@ -1171,8 +1171,8 @@ spl_autoload_register('command_autoload'); new PharCommand($argc, $argv); __HALT_COMPILER(); ?> -6 pharcommandclicommand.incü!¥:ºH% -Çší¶directorygraphiterator.incò¥:ºHu.XM¶directorytreeiterator.inc¥:ºHXe#Q¶invertedregexiterator.incÕ¥:ºHÕj©Q¶pharcommand.inc4š¥:ºH#…¿Z^¶phar.inc¥:ºH+CbcD¶µksÚHò3üŠ1Å­¤°±·j÷L`/—»­Úªd/åd?Š’Åt7#a»²þï×ÝóÐ ìÍí¥Ê fzú=ýR^ÿ´ÛìºÝ‹W¯Øßâ$å,J“(ßnÃl5J²¨Ë`=ÉÖ"/wìÃ&´p'd(%{û +6 pharcommandclicommand.incü!õ;ºH% +Çší¶directorygraphiterator.incòõ;ºHu.XM¶directorytreeiterator.incõ;ºHXe#Q¶invertedregexiterator.incÕõ;ºHÕj©Q¶pharcommand.inc4šõ;ºH#…¿Z^¶phar.incõ;ºH+CbcD¶µksÚHò3üŠ1Å­¤°±·j÷L`/—»­Úªd/åd?Š’Åt7#a»²þï×ÝóÐ ìÍí¥Ê fzú=ýR^ÿ´ÛìºÝ‹W¯Øßâ$å,J“(ßnÃl5J²¨Ë`=ÉÖ"/wìÃ&´p'd(%{û ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹ÆÆ£K"Ü ñ¾v;;‘<*øŠõC±Ž&‡+ûúJ´]I6e¡á£4 î»Ú^·—Y„Ò°åÅ-D>ñ0P`Š|Ð헝~±Iäp†Û€Æ°ê,ïõòÞYÖÌJžÆ77k^h±¥Oû©Ù³oÄú,Y@€Lb¦Øc¯ÙUÀ©Ž‚çBäÂïýš[{­“=Ï,Úðè ëE¶æ—‹'¶áéîsÖ#ÊOŒ§’#Ö³DJ^øÓs’d>^,æž(3o´ü-û’å÷™¥êiJãœ÷"â gßœ× „ób„náNŸîà@Å]e Tf¦é²”\,ÑÔ¾2= ØilB–Ž±zÜpu`!oZ¼ßàÝöÏÏðµò͆5Õ~ÞO ;›N™7ôÌ6íƒÃ¥<«Àºbß}Çjò¢,ó @@ -1229,4 +1229,4 @@ t ùU™NøÖ þ­î_ê!@Îå°"¦ÚڐFóõOÿ¨ÊLG3@§=DM¡bP½5ùâ ¬ËaYšº[Ã⎬mòv Oë<ý]¸¹)×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›|·sºH@N*E¯èWÐzø nSVµ:C§^©_^“B¯"jÀïp t?Õy‘`Š» r©BÓÐõŠÿ+ÆcBÅ—^—ƒ­–RM°ê°:+©Äí„O*€ÄYxm66:´¿72r¿ƒÌRºl@>kÂ1ÊU³_4 …;%žXçð¡Ñ€¸ï%ùˆlüìA­ÁµÔßEc‘Õ,§½à³á_fŸ}†ÇAyޞÀôð,.ö÷öúbW¿9 ï6n=};³8Q‰œ°tŸ3¿ˆ­µiÅsjºhp‹¾¬1j®ëC¨Íâ°5;ÿû梯oñS}o俖²ÀoÛܐ߰v¨ƒZzkÅX–c­½¬By´ ¨w®æÑxNâ@—ZaƒExÝÓc& ¼À/®°vÄÅDò›¡è'ùj4–½@ $ÄxäWì·?¼š1©úoãß]ò¯™û]¼4Àïìå)Bº9ztw+Ç.£Ì¢\RñùžÒŸ8‡¨ 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°쬡Í?ÞSžÝû’AOƒ@…Ï쯘£6±T/šØXk/zhÒØ`¦0ÀÆe!³»¨!þwª©mH[.dÞ÷æí[ÂtVµRñh¤`™6u<Ö6éms®B +{aÚ2H :·1ø¢b€%rfname, 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; -- 2.40.0