From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tanay Abhra Subject: [PATCH v2 06/11] rerere.c: replace `git_config()` with `git_config_get_*()` family Date: Thu, 7 Aug 2014 09:21:21 -0700 Message-ID: <1407428486-19049-7-git-send-email-tanayabh@gmail.com> References: <1407428486-19049-1-git-send-email-tanayabh@gmail.com> Cc: Tanay Abhra , Matthieu Moy , Ramkumar Ramachandra To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Aug 07 18:23:27 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XFQTI-00066F-31 for gcvg-git-2@plane.gmane.org; Thu, 07 Aug 2014 18:23:20 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932396AbaHGQXQ (ORCPT ); Thu, 7 Aug 2014 12:23:16 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:52900 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932312AbaHGQXN (ORCPT ); Thu, 7 Aug 2014 12:23:13 -0400 Received: by mail-pa0-f52.google.com with SMTP id bj1so5689627pad.11 for ; Thu, 07 Aug 2014 09:23:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zS3v4nXMWeVexrgG6wlDFJWVcNooN8zXH/av7qQ7WtM=; b=i5HAT9X68YDjDcqzqYMJElSBK5ROg5q6Hn3yKWQyLI8VuPPpTFzO5+7Gid5/+QGAEC DKZ8kU15U5qmWvsM9pWxi+f8GwQp9BNZG6oqLxwDmVWZiKmlA/qByFsdv9T9Arhv4bvO 6HsZHVJrRQQnucNcu/8cN91X1orp7rjU6VnBaBovqUEKZ4P5ShNnadDh7ZLUS3JTK7ul GwyPZkr2N2vzLVQba0waiQ92N1y+j/CIJ/v5Q3SaBjIZgTUzGCPOwZ1LZFYt/Fwprd2T N/SzdyO4t3P3q/n30yczhwmLZduvW8XH3kA4b2CNeIle/Z0JCpl9ZS2N1iYoe+eq/RGe 3ESw== X-Received: by 10.70.65.34 with SMTP id u2mr18646396pds.58.1407428593628; Thu, 07 Aug 2014 09:23:13 -0700 (PDT) Received: from localhost.localdomain ([223.176.226.83]) by mx.google.com with ESMTPSA id zt5sm16022338pac.31.2014.08.07.09.23.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Aug 2014 09:23:13 -0700 (PDT) X-Mailer: git-send-email 1.9.0.GIT In-Reply-To: <1407428486-19049-1-git-send-email-tanayabh@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Use `git_config_get_*()` family instead of `git_config()` to take advantage of the config-set API which provides a cleaner control flow. Signed-off-by: Tanay Abhra --- rerere.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/rerere.c b/rerere.c index d84b495..20b18ad 100644 --- a/rerere.c +++ b/rerere.c @@ -573,15 +573,11 @@ static int do_plain_rerere(struct string_list *rr, int fd) return write_rr(rr, fd); } -static int git_rerere_config(const char *var, const char *value, void *cb) +static void git_rerere_config(void) { - if (!strcmp(var, "rerere.enabled")) - rerere_enabled = git_config_bool(var, value); - else if (!strcmp(var, "rerere.autoupdate")) - rerere_autoupdate = git_config_bool(var, value); - else - return git_default_config(var, value, cb); - return 0; + git_config_get_bool("rerere.enabled", &rerere_enabled); + git_config_get_bool("rerere.autoupdate", &rerere_autoupdate); + git_config(git_default_config, NULL); } static int is_rerere_enabled(void) @@ -606,7 +602,7 @@ int setup_rerere(struct string_list *merge_rr, int flags) { int fd; - git_config(git_rerere_config, NULL); + git_rerere_config(); if (!is_rerere_enabled()) return -1; @@ -699,24 +695,6 @@ static void unlink_rr_item(const char *name) rmdir(git_path("rr-cache/%s", name)); } -struct rerere_gc_config_cb { - int cutoff_noresolve; - int cutoff_resolve; -}; - -static int git_rerere_gc_config(const char *var, const char *value, void *cb) -{ - struct rerere_gc_config_cb *cf = cb; - - if (!strcmp(var, "gc.rerereresolved")) - cf->cutoff_resolve = git_config_int(var, value); - else if (!strcmp(var, "gc.rerereunresolved")) - cf->cutoff_noresolve = git_config_int(var, value); - else - return git_default_config(var, value, cb); - return 0; -} - void rerere_gc(struct string_list *rr) { struct string_list to_remove = STRING_LIST_INIT_DUP; @@ -724,9 +702,12 @@ void rerere_gc(struct string_list *rr) struct dirent *e; int i, cutoff; time_t now = time(NULL), then; - struct rerere_gc_config_cb cf = { 15, 60 }; + int cutoff_noresolve = 15; + int cutoff_resolve = 60; - git_config(git_rerere_gc_config, &cf); + git_config_get_int("gc.rerereresolved", &cutoff_resolve); + git_config_get_int("gc.rerereunresolved", &cutoff_noresolve); + git_config(git_default_config, NULL); dir = opendir(git_path("rr-cache")); if (!dir) die_errno("unable to open rr-cache directory"); @@ -736,12 +717,12 @@ void rerere_gc(struct string_list *rr) then = rerere_last_used_at(e->d_name); if (then) { - cutoff = cf.cutoff_resolve; + cutoff = cutoff_resolve; } else { then = rerere_created_at(e->d_name); if (!then) continue; - cutoff = cf.cutoff_noresolve; + cutoff = cutoff_noresolve; } if (then < now - cutoff * 86400) string_list_append(&to_remove, e->d_name); -- 1.9.0.GIT