From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "Kyle J. McKay" <mackyle@gmail.com>
Subject: [PATCH 3/9] daemon/config: factor out duplicate xstrdup_tolower
Date: Wed, 21 May 2014 06:28:22 -0400 [thread overview]
Message-ID: <20140521102822.GC30464@sigill.intra.peff.net> (raw)
In-Reply-To: <20140521102524.GA30301@sigill.intra.peff.net>
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>
---
Unlike the last patch, this one does _not_ get used elsewhere in this
series. It's just a cleanup I happened to notice while writing the other
one. It could be omitted, or applied separately.
builtin/config.c | 15 +--------------
daemon.c | 8 --------
strbuf.c | 13 +++++++++++++
strbuf.h | 2 ++
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c
index 5677c94..fcd8474 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -395,19 +395,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;
@@ -422,7 +409,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';
diff --git a/daemon.c b/daemon.c
index eba1255..f9c63e9 100644
--- a/daemon.c
+++ b/daemon.c
@@ -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)
{
diff --git a/strbuf.c b/strbuf.c
index a1b8a47..d289d1a 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -577,3 +577,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;
+}
diff --git a/strbuf.h b/strbuf.h
index 6b6f745..25328b9 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -184,4 +184,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 */
--
2.0.0.rc1.436.g03cb729
next prev parent reply other threads:[~2014-05-21 10:28 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 10:25 [PATCH 0/9] handle alternate charsets for remote http errors Jeff King
2014-05-21 10:27 ` [PATCH 1/9] test-lib: preserve GIT_CURL_VERBOSE from the environment Jeff King
2014-05-21 10:27 ` [PATCH 2/9] strbuf: add strbuf_tolower function Jeff King
2014-05-22 0:07 ` Kyle J. McKay
2014-05-22 5:58 ` Jeff King
2014-05-22 18:36 ` Junio C Hamano
2014-05-22 18:41 ` Jeff King
2014-05-22 21:04 ` Junio C Hamano
2014-05-23 20:03 ` Jeff King
2014-05-22 22:52 ` Kyle J. McKay
2014-05-23 20:05 ` Jeff King
2014-05-23 22:34 ` Kyle J. McKay
2014-05-21 10:28 ` Jeff King [this message]
2014-05-21 10:29 ` [PATCH 4/9] http: normalize case of returned content-type Jeff King
2014-05-21 10:29 ` [PATCH 5/9] t/lib-httpd: use write_script to copy CGI scripts Jeff King
2014-05-21 10:29 ` [PATCH 6/9] t5550: test display of remote http error messages Jeff King
2014-05-21 10:33 ` [PATCH 7/9] remote-curl: recognize text/plain with a charset parameter Jeff King
2014-05-22 0:07 ` Kyle J. McKay
2014-05-22 6:05 ` Jeff King
2014-05-22 7:27 ` Kyle J. McKay
2014-05-22 9:02 ` Jeff King
2014-05-22 7:12 ` Peter Krefting
2014-05-22 9:05 ` Jeff King
2014-05-22 10:19 ` Peter Krefting
2014-05-21 10:33 ` [PATCH 8/9] strbuf: add strbuf_reencode helper Jeff King
2014-05-21 10:33 ` [PATCH 9/9] remote-curl: reencode http error messages Jeff King
2014-05-22 0:07 ` Kyle J. McKay
2014-05-22 6:05 ` Jeff King
2014-05-22 7:26 ` Peter Krefting
2014-05-22 9:28 ` [PATCH v2 0/9] handle alternate charsets for remote http errors Jeff King
2014-05-22 9:28 ` [PATCH v2 1/8] test-lib: preserve GIT_CURL_VERBOSE from the environment Jeff King
2014-05-22 9:28 ` [PATCH v2 2/8] t/lib-httpd: use write_script to copy CGI scripts Jeff King
2014-05-22 9:29 ` [PATCH v2 3/8] t5550: test display of remote http error messages Jeff King
2014-05-22 9:29 ` [PATCH v2 4/8] http: extract type/subtype portion of content-type Jeff King
2014-05-22 22:52 ` Kyle J. McKay
2014-05-23 20:12 ` Jeff King
2014-05-23 22:00 ` Kyle J. McKay
2014-05-22 9:30 ` [PATCH v2 5/8] http: optionally extract charset parameter from content-type Jeff King
2014-05-22 9:30 ` [PATCH v2 6/8] strbuf: add strbuf_reencode helper Jeff King
2014-05-22 9:30 ` [PATCH v2 7/8] remote-curl: reencode http error messages Jeff King
2014-05-22 9:36 ` [PATCH v2 8/8] http: default text charset to iso-8859-1 Jeff King
2014-05-23 2:02 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140521102822.GC30464@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mackyle@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).