diff options
author | Jeff King <peff@peff.net> | 2014-05-22 13:44:09 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-05-23 23:39:44 +0400 |
commit | 88d5a6f6cd1b63e1637027322cdfdbeefe38c3ed (patch) | |
tree | 5bb6adf34ea3a774df7f1645bf9de485542ef028 | |
parent | 7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d (diff) |
daemon/config: factor out duplicate xstrdup_tolower
We have two implementations of the same function; let's drop
that to one. We take the name from daemon.c, but the
implementation (which is just slightly more efficient) from
the config code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | builtin/config.c | 15 | ||||
-rw-r--r-- | daemon.c | 8 | ||||
-rw-r--r-- | strbuf.c | 13 | ||||
-rw-r--r-- | strbuf.h | 2 |
4 files changed, 16 insertions, 22 deletions
diff --git a/builtin/config.c b/builtin/config.c index 20e89fe4e0..00b0c240fc 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -396,19 +396,6 @@ static int urlmatch_collect_fn(const char *var, const char *value, void *cb) return 0; } -static char *dup_downcase(const char *string) -{ - char *result; - size_t len, i; - - len = strlen(string); - result = xmalloc(len + 1); - for (i = 0; i < len; i++) - result[i] = tolower(string[i]); - result[i] = '\0'; - return result; -} - static int get_urlmatch(const char *var, const char *url) { char *section_tail; @@ -423,7 +410,7 @@ static int get_urlmatch(const char *var, const char *url) if (!url_normalize(url, &config.url)) die("%s", config.url.err); - config.section = dup_downcase(var); + config.section = xstrdup_tolower(var); section_tail = strchr(config.section, '.'); if (section_tail) { *section_tail = '\0'; @@ -475,14 +475,6 @@ static void make_service_overridable(const char *name, int ena) die("No such service %s", name); } -static char *xstrdup_tolower(const char *str) -{ - char *p, *dup = xstrdup(str); - for (p = dup; *p; p++) - *p = tolower(*p); - return dup; -} - static void parse_host_and_port(char *hostport, char **host, char **port) { @@ -570,3 +570,16 @@ int fprintf_ln(FILE *fp, const char *fmt, ...) return -1; return ret + 1; } + +char *xstrdup_tolower(const char *string) +{ + char *result; + size_t len, i; + + len = strlen(string); + result = xmalloc(len + 1); + for (i = 0; i < len; i++) + result[i] = tolower(string[i]); + result[i] = '\0'; + return result; +} @@ -177,4 +177,6 @@ extern int printf_ln(const char *fmt, ...); __attribute__((format (printf,2,3))) extern int fprintf_ln(FILE *fp, const char *fmt, ...); +char *xstrdup_tolower(const char *); + #endif /* STRBUF_H */ |