From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jonathan Nieder" <jrnieder@gmail.com>,
"Joachim Schmitz" <jojo@schmitz-digital.de>,
"René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
git@vger.kernel.org
Subject: [PATCHv2 7/8] help: use parse_config_key for man config
Date: Wed, 23 Jan 2013 01:27:09 -0500 [thread overview]
Message-ID: <20130123062709.GG5036@sigill.intra.peff.net> (raw)
In-Reply-To: <20130123062132.GA2038@sigill.intra.peff.net>
The resulting code ends up about the same length, but it is
a little more self-explanatory. It now explicitly documents
and checks the pre-condition that the incoming var starts
with "man.", and drops the magic offset "4".
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/help.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/help.c b/builtin/help.c
index bd86253..04cb77d 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -237,21 +237,21 @@ static int add_man_viewer_info(const char *var, const char *value)
static int add_man_viewer_info(const char *var, const char *value)
{
- const char *name = var + 4;
- const char *subkey = strrchr(name, '.');
+ const char *name, *subkey;
+ int namelen;
- if (!subkey)
+ if (parse_config_key(var, "man", &name, &namelen, &subkey) < 0 || !name)
return 0;
- if (!strcmp(subkey, ".path")) {
+ if (!strcmp(subkey, "path")) {
if (!value)
return config_error_nonbool(var);
- return add_man_viewer_path(name, subkey - name, value);
+ return add_man_viewer_path(name, namelen, value);
}
- if (!strcmp(subkey, ".cmd")) {
+ if (!strcmp(subkey, "cmd")) {
if (!value)
return config_error_nonbool(var);
- return add_man_viewer_cmd(name, subkey - name, value);
+ return add_man_viewer_cmd(name, namelen, value);
}
return 0;
--
1.8.0.2.15.g815dc66
next prev parent reply other threads:[~2013-01-23 6:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-13 17:42 [PATCH] archive-tar: fix sanity check in config parsing René Scharfe
2013-01-13 20:00 ` Jeff King
2013-01-14 8:17 ` Joachim Schmitz
2013-01-14 12:44 ` Jeff King
2013-01-14 14:58 ` Jeff King
2013-01-14 15:00 ` [PATCH 1/6] config: add helper function for parsing key names Jeff King
2013-01-14 18:08 ` Junio C Hamano
2013-01-15 16:04 ` Jeff King
2013-01-15 17:07 ` Junio C Hamano
2013-01-18 20:53 ` Junio C Hamano
2013-01-23 6:21 ` [PATCHv2 0/8] config key-parsing cleanups Jeff King
2013-01-23 6:23 ` [PATCHv2 1/8] config: add helper function for parsing key names Jeff King
2013-01-23 6:23 ` [PATCHv2 2/8] archive-tar: use parse_config_key when parsing config Jeff King
2013-01-23 6:24 ` [PATCHv2 3/8] convert some config callbacks to parse_config_key Jeff King
2013-01-23 6:25 ` [PATCHv2 4/8] userdiff: drop parse_driver function Jeff King
2013-01-23 6:25 ` [PATCHv2 5/8] submodule: use parse_config_key when parsing config Jeff King
2013-01-23 20:45 ` Jens Lehmann
2013-01-23 6:26 ` [PATCHv2 6/8] submodule: simplify memory handling in config parsing Jeff King
2013-01-23 20:51 ` Jens Lehmann
2013-01-23 6:27 ` Jeff King [this message]
2013-01-23 6:27 ` [PATCHv2 8/8] reflog: use parse_config_key in config callback Jeff King
2013-01-23 7:04 ` Junio C Hamano
2013-01-23 7:27 ` [PATCHv2 0/8] config key-parsing cleanups Jonathan Nieder
2013-01-14 15:02 ` [PATCH 2/6] archive-tar: use match_config_key when parsing config Jeff King
2013-01-14 15:03 ` [PATCH 3/6] convert some config callbacks to match_config_key Jeff King
2013-01-14 16:55 ` Jonathan Nieder
2013-01-14 17:06 ` Jeff King
2013-01-14 18:05 ` Jeff King
2013-01-14 15:04 ` [PATCH 4/6] userdiff: drop parse_driver function Jeff King
2013-01-14 15:04 ` [PATCH 5/6] submodule: use match_config_key when parsing config Jeff King
2013-01-14 15:07 ` [PATCH 6/6] submodule: simplify memory handling in config parsing Jeff King
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=20130123062709.GG5036@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jojo@schmitz-digital.de \
--cc=jrnieder@gmail.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/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).