com php-src: avoid repeated strlen() usage: ext/zip/php_zip .c
| From: | Anatol Belski | Date: | Sun, 14 Sep 2014 10:59:31 +0000 |
| Subject: | com php-src: avoid repeated strlen() usage: ext/zip/php_zip .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81578@lists.php.net to get a copy of this message | ||
Commit: b6b376efe538997369efc3dfffede295f433105d
Author: Anatol Belski <ab@php.net> Sun, 14 Sep 2014 12:59:31 +0200
Parents: f1ba5389cd0e13da2230dd411c6151dedde88552
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6b376efe538997369efc3dfffede295f433105d
Log:
avoid repeated strlen() usage
Changed paths:
M ext/zip/php_zip.c
Diff:
diff --git a/ext/zip/php_zip..c b/ext/zip/php_zip.c
index 5f98a63..0f6a6bf 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1609,9 +1609,11 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type)
/*
RETURN_FALSE;
}
- if (remove_path && remove_path_len > 1 && (remove_path[strlen(remove_path) - 1]
== '/' ||
- remove_path[strlen(remove_path) - 1] == '\\')) {
- remove_path[strlen(remove_path) - 1] = '\0';
+ if (remove_path && remove_path_len > 1) {
+ int tmp_idx = (int)strlen(remove_path) - 1;
+ if (remove_path[tmp_idx] == '/' || remove_path[tmp_idx] == '\\') {
+ remove_path[tmp_idx] = '\0';
+ }
}
if (type == 1) {