implement ends_with via strip_suffix
The ends_with function is essentially a simplified version of strip_suffix, in which we throw away the stripped length. Implementing it as an inline on top of strip_suffix has two advantages: 1. We save a bit of duplicated code. 2. The suffix is typically a string literal, and we call strlen on it. By making the function inline, many compilers can replace the strlen call with a constant. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jun 30, 2014 at 12:58 UTC
f52a35fd63cc6d570083cedc15576d01c0968d98
2 files changed
+6
-10
git-compat-util.h
+6
-1
@@ -339,7 +339,6 @@ extern void set_error_routine(void (*routine)(const char *err, va_list params));
339
extern void set_die_is_recursing_routine(int (*routine)(void));
340
341
extern int starts_with(const char *str, const char *prefix);
342
-extern int ends_with(const char *str, const char *suffix);
342
343
static inline const char *skip_prefix(const char *str, const char *prefix)
344
{
@@ -377,6 +376,12 @@ static inline int strip_suffix(const char *str, const char *suffix, size_t *len)
376
return strip_suffix_mem(str, len, suffix);
377
}
378
379
+static inline int ends_with(const char *str, const char *suffix)
380
+{
381
+ size_t len;
382
+ return strip_suffix(str, suffix, &len);
383
+}
384
+
385
#if defined(NO_MMAP) || defined(USE_WIN32_MMAP)
386
387
#ifndef PROT_READ
strbuf.c
-9
@@ -10,15 +10,6 @@ int starts_with(const char *str, const char *prefix)
10
return 0;
11
}
12
13
-int ends_with(const char *str, const char *suffix)
14
-{
15
- int len = strlen(str), suflen = strlen(suffix);
16
- if (len < suflen)
17
- return 0;
18
- else
19
- return !strcmp(str + len - suflen, suffix);
20
-}
21
-
13
/*
14
* Used as the default ->buf value, so that people can always assume
15
* buf is non NULL and ->buf is NUL terminated even for a freshly