From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 583391F4B4 for ; Wed, 9 Dec 2020 20:05:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388044AbgLIUD0 (ORCPT ); Wed, 9 Dec 2020 15:03:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387827AbgLIUDU (ORCPT ); Wed, 9 Dec 2020 15:03:20 -0500 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEA2AC061285 for ; Wed, 9 Dec 2020 12:02:09 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id d3so2620332wmb.4 for ; Wed, 09 Dec 2020 12:02:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kb74uT4iBhesBQhjLaQ7t4/yZcNCQYxHO6w0RWtzxOA=; b=ZpIdwQwGvOLSBox7UpLQqFAQUCXNvrLFe8u9FLVJdN7vcn/Bf+QJ2pa+xDOPS1IJv9 na5MOhjiPUNhSoQCh50qEhEdNwE3YbT78fSgvu2pgzXUfy+8bPk7+sNcHHR1k6W0+csw +KYE5PVLSGGewdTdf5lwqKYARj0DHDzxJaVoUpRJc4PEO3YEdWZ5mCWm7tiupMrZYS1+ qCHGsRDTs8X9SjnztpEv+k6fgFzER5sMnrHNDPYqzx3d3aVrV0WywwMkFKFhMWUlSmzN kp7Hs5UzW/9oULts7yMHDmDIF8MXDQec8SfQC64+Fs/XTbxVkd30sIvmPRSRIeA9eppy fTdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kb74uT4iBhesBQhjLaQ7t4/yZcNCQYxHO6w0RWtzxOA=; b=t8Ol+UjAAF9ossLmZsILa13XniKaqmthABHmN3nPaVrj8l7B5JGZNBcWQzUolpzrX/ XqLlkEnvAdUk+2t8dsghYCRV4/1NmWCRMMnzHipRu95noUcUmKoAWxhZpjanVftJX6SK dx9C14C9lrSLUitTbPtnz9aN+ePjopmkrcjYCQJg6MEYPqROzDv7vWtg8xNT3bP7e4ys UT/r0v9JMWtKoZyd6yKFxziZNJ6oco3d64WurCNcgnVqmxo8BDNxXZ2WpE8jo167aDwR TqitJ8kbpFwk/SQSA9nKDB/P+FQpt5LWEAxgLm3NTbtH//qqwscGV8RVpXR7Xb2PeRff Yg/A== X-Gm-Message-State: AOAM532RDhdm9aaNlUKnlc1NOR/rbZkCRzSm+b93mK+GB014T28uv4h1 Rt0uUxETA/YMT/cJqe0QGvkBFPyDEx4BZA== X-Google-Smtp-Source: ABdhPJwrfY+Q3HUoYgsqtlTzkhaXHRebIAYjj/yr/qLKAzk3htS+znGTkoGSaMHqUyATL9trSKXJxw== X-Received: by 2002:a7b:c841:: with SMTP id c1mr4635371wml.31.1607544128648; Wed, 09 Dec 2020 12:02:08 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id 34sm5762128wrh.78.2020.12.09.12.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 12:02:07 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , "brian m . carlson" , Eric Sunshine , Johannes Schindelin , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 09/10] fsck: make fsck_config() re-usable Date: Wed, 9 Dec 2020 21:01:39 +0100 Message-Id: <20201209200140.29425-10-avarab@gmail.com> X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8 In-Reply-To: <20201126222257.5629-1-avarab@gmail.com> References: <20201126222257.5629-1-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move the fsck_config() function from builtin/fsck.c to fsck.[ch]. This allows for re-using it in other tools that expose fsck logic and want to support its configuration variables. A logical continuation of this change would be to use a common function for all of {fetch,receive}.fsck.* and fsck.*. See 5d477a334a6 (fsck (receive-pack): allow demoting errors to warnings, 2015-06-22) and my own 1362df0d413 (fetch: implement fetch.fsck.*, 2018-07-27) for the relevant code. However, those routines want to not parse the fsck.skipList into OIDs, but rather pass them along with the --strict option to another process. It would be possible to refactor that whole thing so we support e.g. a "fetch." prefix, then just keep track of the skiplist as a filename instead of parsing it, and learn to spew that all out from our internal structures into something we can append to the --strict option. But instead I'm planning to re-use this in "mktag", which'll just re-use these "fsck.*" variables as-is. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/fsck.c | 20 +------------------- fsck.c | 25 +++++++++++++++++++++++++ fsck.h | 7 +++++++ 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index fbf26cafcfd..821e7798c70 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -73,25 +73,7 @@ static const char *printable_type(const struct object_id *oid, static int fsck_config(const char *var, const char *value, void *cb) { - if (strcmp(var, "fsck.skiplist") == 0) { - const char *path; - struct strbuf sb = STRBUF_INIT; - - if (git_config_pathname(&path, var, value)) - return 1; - strbuf_addf(&sb, "skiplist=%s", path); - free((char *)path); - fsck_set_msg_types(&fsck_obj_options, sb.buf); - strbuf_release(&sb); - return 0; - } - - if (skip_prefix(var, "fsck.", &var)) { - fsck_set_msg_type(&fsck_obj_options, var, value); - return 0; - } - - return git_default_config(var, value, cb); + return fsck_config_internal(var, value, cb, &fsck_obj_options); } static int objerror(struct object *obj, const char *err) diff --git a/fsck.c b/fsck.c index bed5e20e03b..9067a290a2e 100644 --- a/fsck.c +++ b/fsck.c @@ -1310,3 +1310,28 @@ int fsck_finish(struct fsck_options *options) oidset_clear(&gitmodules_done); return ret; } + +int fsck_config_internal(const char *var, const char *value, void *cb, + struct fsck_options *options) +{ + if (strcmp(var, "fsck.skiplist") == 0) { + const char *path; + struct strbuf sb = STRBUF_INIT; + + if (git_config_pathname(&path, var, value)) + return 1; + strbuf_addf(&sb, "skiplist=%s", path); + free((char *)path); + fsck_set_msg_types(options, sb.buf); + strbuf_release(&sb); + return 0; + } + + if (skip_prefix(var, "fsck.", &var)) { + fsck_set_msg_type(options, var, value); + return 0; + } + + return git_default_config(var, value, cb); +} + diff --git a/fsck.h b/fsck.h index 29ee4c45e87..423c467feb7 100644 --- a/fsck.h +++ b/fsck.h @@ -103,4 +103,11 @@ void fsck_put_object_name(struct fsck_options *options, const char *fsck_describe_object(struct fsck_options *options, const struct object_id *oid); +/* + * git_config() callback for use by fsck-y tools that want to support + * fsck. fsck.skipList etc. + */ +int fsck_config_internal(const char *var, const char *value, void *cb, + struct fsck_options *options); + #endif -- 2.29.2.222.g5d2a92d10f8