From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
"Christian Couder" <christian.couder@gmail.com>,
git@vger.kernel.org, "SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH] config: restructure format_config() for better control flow
Date: Thu, 20 Aug 2015 16:14:22 +0200 [thread overview]
Message-ID: <1440080062-26811-1-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <xmqqa8twj7b8.fsf@gitster.dls.corp.google.com>
Commit 578625fa91 (config: add '--name-only' option to list only
variable names, 2015-08-10) modified format_config() such that it
returned from the middle of the function when showing only keys,
resulting in ugly code structure.
Reorganize the if statements and dealing with the key-value delimiter to
make the function easier to read.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
> The topic is now in 'next'; I think I've locally fixed it up for
> these when I originally queued them a few days ago, so if there are
> any remaining issues, please throw incremental polishing patches.
OK, though it's not a major issue, I think this is still worth doing on
top.
builtin/config.c | 78 +++++++++++++++++++++++++++-----------------------------
1 file changed, 37 insertions(+), 41 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c
index 631db458ec..810e104224 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -108,52 +108,48 @@ struct strbuf_list {
static int format_config(struct strbuf *buf, const char *key_, const char *value_)
{
- int must_free_vptr = 0;
- int must_print_delim = 0;
- char value[256];
- const char *vptr = value;
-
strbuf_init(buf, 0);
- if (show_keys) {
+ if (show_keys)
strbuf_addstr(buf, key_);
- must_print_delim = 1;
- }
- if (omit_values) {
- strbuf_addch(buf, term);
- return 0;
- }
- if (types == TYPE_INT)
- sprintf(value, "%"PRId64,
- git_config_int64(key_, value_ ? value_ : ""));
- else if (types == TYPE_BOOL)
- vptr = git_config_bool(key_, value_) ? "true" : "false";
- else if (types == TYPE_BOOL_OR_INT) {
- int is_bool, v;
- v = git_config_bool_or_int(key_, value_, &is_bool);
- if (is_bool)
- vptr = v ? "true" : "false";
- else
- sprintf(value, "%d", v);
- } else if (types == TYPE_PATH) {
- if (git_config_pathname(&vptr, key_, value_) < 0)
- return -1;
- must_free_vptr = 1;
- } else if (value_) {
- vptr = value_;
- } else {
- /* Just show the key name */
- vptr = "";
- must_print_delim = 0;
- }
+ if (!omit_values) {
+ int must_free_vptr = 0;
+ int must_add_delim = show_keys;
+ char value[256];
+ const char *vptr = value;
- if (must_print_delim)
- strbuf_addch(buf, key_delim);
- strbuf_addstr(buf, vptr);
+ if (types == TYPE_INT)
+ sprintf(value, "%"PRId64,
+ git_config_int64(key_, value_ ? value_ : ""));
+ else if (types == TYPE_BOOL)
+ vptr = git_config_bool(key_, value_) ? "true" : "false";
+ else if (types == TYPE_BOOL_OR_INT) {
+ int is_bool, v;
+ v = git_config_bool_or_int(key_, value_, &is_bool);
+ if (is_bool)
+ vptr = v ? "true" : "false";
+ else
+ sprintf(value, "%d", v);
+ } else if (types == TYPE_PATH) {
+ if (git_config_pathname(&vptr, key_, value_) < 0)
+ return -1;
+ must_free_vptr = 1;
+ } else if (value_) {
+ vptr = value_;
+ } else {
+ /* Just show the key name */
+ vptr = "";
+ must_add_delim = 0;
+ }
+
+ if (must_add_delim)
+ strbuf_addch(buf, key_delim);
+ strbuf_addstr(buf, vptr);
+
+ if (must_free_vptr)
+ free((char *)vptr);
+ }
strbuf_addch(buf, term);
-
- if (must_free_vptr)
- free((char *)vptr);
return 0;
}
--
2.5.0.415.g33d64ef
next prev parent reply other threads:[~2015-08-20 14:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 9:46 [PATCHv3 0/2] 'git config --names-only' to help the completion script SZEDER Gábor
2015-08-10 9:46 ` [PATCHv3 1/2] config: add '--names-only' option to list only variable names SZEDER Gábor
2015-08-10 13:41 ` Jeff King
2015-08-10 17:18 ` Junio C Hamano
2015-08-12 23:47 ` SZEDER Gábor
2015-08-13 1:39 ` Junio C Hamano
2015-08-20 14:14 ` SZEDER Gábor [this message]
2015-08-20 14:45 ` [PATCH] config: restructure format_config() for better control flow Jeff King
2015-08-20 14:46 ` [PATCH 1/3] format_config: don't init strbuf Jeff King
2015-08-20 14:47 ` [PATCH 2/3] format_config: simplify buffer handling Jeff King
2015-08-21 11:52 ` SZEDER Gábor
2015-08-21 17:42 ` Junio C Hamano
2015-08-21 17:43 ` Junio C Hamano
2015-08-21 19:40 ` Jeff King
2015-08-20 14:49 ` [PATCH 3/3] get_urlmatch: avoid useless strbuf write Jeff King
2015-08-20 20:19 ` [PATCH] config: restructure format_config() for better control flow Junio C Hamano
2015-08-10 9:46 ` [PATCHv3 2/2] completion: list variable names reliably with 'git config --names-only' SZEDER Gábor
2015-08-10 13:45 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440080062-26811-1-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).