[PATCH 09/10] pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
- From
René Scharfe <l.s.r@web.de>
- Date
- Mar 22, 2014, 17:15 UTC
- Message-ID
- <1395508560-19893-10-git-send-email-l.s.r@web.de>
- In-Reply-To
- <1395508560-19893-1-git-send-email-l.s.r@web.de>
We need to determine the search term's length only when fixed-string matching is used; regular expression compilation takes a NUL-terminated string directly. Only call strlen() in the former case.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- diffcore-pickaxe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 827a7d7..70753d0 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -205,7 +205,6 @@ void diffcore_pickaxe(struct diff_options *o) { const char *needle = o->pickaxe; int opts = o->pickaxe_opts; - unsigned long len = strlen(needle); regex_t regex, *regexp = NULL; kwset_t kws = NULL; @@ -226,7 +225,7 @@ void diffcore_pickaxe(struct diff_options *o) } else { kws = kwsalloc(DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE) ? tolower_trans_tbl : NULL); - kwsincr(kws, needle, len); + kwsincr(kws, needle, strlen(needle)); kwsprep(kws); }
-- 1.9.1