Some sites that otherwise would use skip_prefix cannot do
so, because it has no way to do case-insensitive
comparisons. Such sites usually get around this by using
strncasecmp, at the cost of having to use magic numbers.
We can help them by providing a case-insensitive version of
skip_prefix.
Unfortunately, we don't share any code with the original
skip_prefix. Since this is performance-sensitive code, we
would not want to introduce an extra "do we are about case?"
conditional into the middle of the loop. We could instead
use macros or another technique to generate the
almost-identical implementations, but the function simply
isn't long enough to merit that confusing boilerplate.
To show off the new function, we convert a simple case in
log's add_header function.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
builtin/log.c | 8 ++++----
strutil.h | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 76823e6..44c6b26 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -677,10 +677,10 @@ static void add_header(const char *value)
struct string_list_item *item;
size_t len;
- if (!strncasecmp(value, "to: ", 4))
- item = string_list_append(&extra_to, value + 4);
- else if (!strncasecmp(value, "cc: ", 4))
- item = string_list_append(&extra_cc, value + 4);
+ if (skip_prefix_icase(value, "to: ", &value))
+ item = string_list_append(&extra_to, value);
+ else if (skip_prefix_icase(value, "cc: ", &value))
+ item = string_list_append(&extra_cc, value);
else
item = string_list_append(&extra_hdr, value);
diff --git a/strutil.h b/strutil.h
index 4fa2071..bb4c02d 100644
--- a/strutil.h
+++ b/strutil.h
@@ -32,6 +32,21 @@ static inline int skip_prefix(const char *str, const char *prefix,
}
/*
+ * Identical to skip_prefix, but compare characters case-insensitively.
+ */
+static inline int skip_prefix_icase(const char *str, const char *prefix,
+ const char **out)
+{
+ do {
+ if (!*prefix) {
+ *out = str;
+ return 1;
+ }
+ } while (tolower(*str++) == tolower(*prefix++));
+ return 0;
+}
+
+/*
* If buf ends with suffix, return 1 and subtract the length of the suffix
* from *len. Otherwise, return 0 and leave *len untouched.
*/
--
2.7.0.rc3.367.g09631da
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html