git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tanay Abhra <tanayabh@gmail.com>
To: git@vger.kernel.org
Cc: Tanay Abhra <tanayabh@gmail.com>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	Ramkumar Ramachandra <artagnon@gmail.com>
Subject: [PATCH v2 03/11] read-cache.c: replace `git_config()` with `git_config_get_*()` family
Date: Thu,  7 Aug 2014 09:21:18 -0700	[thread overview]
Message-ID: <1407428486-19049-4-git-send-email-tanayabh@gmail.com> (raw)
In-Reply-To: <1407428486-19049-1-git-send-email-tanayabh@gmail.com>

Use `git_config_get_*()` family instead of `git_config()` to take
advantage of the config-set API which provides a cleaner control flow.

Use an intermediate value, as `version` can not be used directly in
git_config_get_int() due to incompatible type.

Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
 read-cache.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/read-cache.c b/read-cache.c
index 5d3c8bd..acb132d 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1238,24 +1238,16 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
 
 #define INDEX_FORMAT_DEFAULT 3
 
-static int index_format_config(const char *var, const char *value, void *cb)
-{
-	unsigned int *version = cb;
-	if (!strcmp(var, "index.version")) {
-		*version = git_config_int(var, value);
-		return 0;
-	}
-	return 1;
-}
-
 static unsigned int get_index_format_default(void)
 {
 	char *envversion = getenv("GIT_INDEX_VERSION");
 	char *endp;
+	int value;
 	unsigned int version = INDEX_FORMAT_DEFAULT;
 
 	if (!envversion) {
-		git_config(index_format_config, &version);
+		if (!git_config_get_int("index.version", &value))
+			version = value;
 		if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
 			warning(_("index.version set, but the value is invalid.\n"
 				  "Using version %i"), INDEX_FORMAT_DEFAULT);
-- 
1.9.0.GIT

  parent reply	other threads:[~2014-08-07 16:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-07 16:21 [PATCH v2 00/11] git_config callers rewritten with the new config-set API Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 01/11] daemon.c: replace `git_config()` with `git_config_get_bool()` family Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 02/11] http-backend.c: " Tanay Abhra
2014-08-07 16:21 ` Tanay Abhra [this message]
2014-08-07 16:21 ` [PATCH v2 04/11] archive.c: " Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 05/11] fetchpack.c: replace `git_config()` with `git_config_get_*()` family Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 06/11] rerere.c: " Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 07/11] builtin/gc.c: " Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 08/11] pager.c: replace `git_config()` with `git_config_get_value()` Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 09/11] imap-send.c: replace `git_config()` with `git_config_get_*()` family Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 10/11] alias.c: replace `git_config()` with `git_config_get_string()` Tanay Abhra
2014-08-07 16:21 ` [PATCH v2 11/11] branch.c: replace `git_config()` with `git_config_get_string() Tanay Abhra
2014-08-07 17:04   ` Matthieu Moy
2014-08-07 17:56   ` [PATCH v3 " Tanay Abhra
2014-08-07 18:36 ` [PATCH v2 00/11] git_config callers rewritten with the new config-set API Matthieu Moy
2014-08-07 20:10 ` Junio C Hamano

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=1407428486-19049-4-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).