From: Tanay Abhra <tanayabh@gmail.com>
To: git@vger.kernel.org
Cc: Tanay Abhra <tanayabh@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: [RFC/PATCH] notes.c: replace git_config with git_config_get_string
Date: Mon, 23 Jun 2014 03:41:44 -0700 [thread overview]
Message-ID: <1403520105-23250-5-git-send-email-tanayabh@gmail.com> (raw)
In-Reply-To: <1403520105-23250-1-git-send-email-tanayabh@gmail.com>
Use git_config_get_string instead of git_config to take advantage of
the config hash-table api which provides a cleaner control flow.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
notes.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/notes.c b/notes.c
index 5fe691d..fc92eec 100644
--- a/notes.c
+++ b/notes.c
@@ -961,19 +961,6 @@ void string_list_add_refs_from_colon_sep(struct string_list *list,
free(globs_copy);
}
-static int notes_display_config(const char *k, const char *v, void *cb)
-{
- int *load_refs = cb;
-
- if (*load_refs && !strcmp(k, "notes.displayref")) {
- if (!v)
- config_error_nonbool(k);
- string_list_add_refs_by_glob(&display_notes_refs, v);
- }
-
- return 0;
-}
-
const char *default_notes_ref(void)
{
const char *notes_ref = NULL;
@@ -1041,6 +1028,7 @@ struct notes_tree **load_notes_trees(struct string_list *refs)
void init_display_notes(struct display_notes_opt *opt)
{
char *display_ref_env;
+ const char *value;
int load_config_refs = 0;
display_notes_refs.strdup_strings = 1;
@@ -1058,7 +1046,11 @@ void init_display_notes(struct display_notes_opt *opt)
load_config_refs = 1;
}
- git_config(notes_display_config, &load_config_refs);
+ if (load_config_refs && !git_config_get_string("notes.displayref", &value)) {
+ if (!value)
+ config_error_nonbool("notes.displayref");
+ string_list_add_refs_by_glob(&display_notes_refs, value);
+ }
if (opt) {
struct string_list_item *item;
--
1.9.0.GIT
next prev parent reply other threads:[~2014-06-23 10:42 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 10:41 [RFC/PATCH V2] alias.c: replace git_config with git_config_get_string Tanay Abhra
2014-06-23 10:41 ` [RFC/PATCH V2] branch.c: " Tanay Abhra
2014-06-25 4:45 ` Eric Sunshine
2014-06-26 8:09 ` Tanay Abhra
2014-06-29 11:06 ` Eric Sunshine
2014-06-23 10:41 ` [RFC/PATCH] imap-send.c: " Tanay Abhra
2014-06-25 7:09 ` Eric Sunshine
2014-06-26 8:14 ` Tanay Abhra
2014-06-26 16:50 ` Matthieu Moy
2014-06-26 23:57 ` Karsten Blees
2014-06-23 10:41 ` [RFC/PATCH] notes-util.c: " Tanay Abhra
2014-06-25 7:54 ` Eric Sunshine
2014-06-26 8:19 ` Tanay Abhra
2014-06-29 11:01 ` Eric Sunshine
2014-06-30 13:34 ` Karsten Blees
2014-06-30 14:32 ` Eric Sunshine
2014-06-30 14:54 ` Karsten Blees
2014-06-30 14:39 ` Tanay Abhra
2014-06-30 15:56 ` Karsten Blees
2014-06-30 16:21 ` Tanay Abhra
2014-06-30 17:52 ` Junio C Hamano
2014-07-01 8:36 ` Matthieu Moy
2014-06-23 10:41 ` Tanay Abhra [this message]
2014-06-25 8:06 ` [RFC/PATCH] notes.c: " Eric Sunshine
2014-06-26 8:20 ` Tanay Abhra
2014-06-23 10:41 ` [RFC/PATCH] pager.c: " Tanay Abhra
2014-06-25 3:59 ` Eric Sunshine
2014-06-26 8:24 ` Tanay Abhra
2014-06-26 18:46 ` Karsten Blees
2014-06-27 11:55 ` Matthieu Moy
2014-06-27 16:57 ` Karsten Blees
2014-06-27 19:19 ` Matthieu Moy
2014-06-28 5:20 ` Karsten Blees
2014-06-28 6:01 ` Matthieu Moy
2014-06-28 14:29 ` Karsten Blees
2014-06-29 12:04 ` Matthieu Moy
2014-06-23 22:38 ` [RFC/PATCH V2] alias.c: " Jonathan Nieder
2014-06-24 1:50 ` Tanay Abhra
2014-06-25 2:12 ` Eric Sunshine
2014-06-26 8:24 ` Tanay Abhra
2014-06-26 16:39 ` Matthieu Moy
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=1403520105-23250-5-git-send-email-tanayabh@gmail.com \
--to=tanayabh@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/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).