From patchwork Tue May 30 18:41:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260964 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17004C77B73 for ; Tue, 30 May 2023 18:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233157AbjE3Sm1 (ORCPT ); Tue, 30 May 2023 14:42:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231390AbjE3SmX (ORCPT ); Tue, 30 May 2023 14:42:23 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DA8710C for ; Tue, 30 May 2023 11:42:20 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30959c0dfd6so4961381f8f.3 for ; Tue, 30 May 2023 11:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472138; x=1688064138; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=UPfRS8xz+S8liJ8a8okyP16iGqD5WcF5yfvBfyZgQaA=; b=sx8rXBS21RMUyunTic4T/MDnedTWDA6bUeA2GKIzVlsIZ++oexrlIi8emOM5bgOtU3 9Xbe7HVzQNGfNnvb/ujHx/4v9HEH/CJ2rTPALWdCkOaq/OwYJdr+FC1A10+uXNdl3Hgy 6JxwFMOzb8vBzX/bRLI+uBo7SretmoUelorSPXJVAeNoYk+Fc/1g4adHKOLmXiUMrpDR kYuoe3gFh/Ur+L2jGx0CbkVs7cKxyGxyO1W7F2ID/2WL/bMC/ylxoN2JReD1MTG9UeFj MkmvDcFdZOkwtz4tmGnvfODvNyBClVPe1Q/uBqsoPPAGV1ZSq12CRy8VQdEcL3nFc9tP g3dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472138; x=1688064138; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UPfRS8xz+S8liJ8a8okyP16iGqD5WcF5yfvBfyZgQaA=; b=OfqO7p4qxtA1hpMmUcYJqxWAxoOPYdLEGa9QUM8hoFEvNJTk9ZrkDGBtl5L+GCVFgL NSmxS2wAwyN0kx+A21q7O2NVP3Ir80jDLWI2omCmtmGv0pOIjewufWEV74St2fMxylvJ XMuFHGF4tU6oh9XMfkZdkPPCnc8/19T7Xe4C5JnDKMchqSol6WFgiHk9IMhX5YxQCLCi xG0Pg2X8vz3AmkvQVr1sQvPiJresxQcAMrZc9bac5bVLqxMjT6Hq+mOw4bIDqkURc6vh xtM7iNn6/R4yHSRPcF8hYiRTp4lapRsmC5kpSVWHJ1MHrNGmPyNYP2kPFB8aeZ6j2TVL kRig== X-Gm-Message-State: AC+VfDxhEQoFvE8Gj4LUMnFIr7EjrnEyMshUx146sd6NugYucYwy/lma muW7kd6kEg/uxRFGbaCHWwoG+1uTR9E= X-Google-Smtp-Source: ACHHUZ5rTU+7T8i++EqwRqAb1VihYEKsWwUu+9YC1ej58q/zcjlpIkwfMO2f09pyDAwTHmse0tlDUQ== X-Received: by 2002:adf:ec89:0:b0:306:44a9:76a1 with SMTP id z9-20020adfec89000000b0030644a976a1mr2255355wrn.17.1685472138309; Tue, 30 May 2023 11:42:18 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n11-20020adfe34b000000b003078cd719ffsm4128932wrj.95.2023.05.30.11.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:18 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 30 May 2023 18:41:59 +0000 Subject: [PATCH v2 01/14] config: inline git_color_default_config Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo git_color_default_config() is a shorthand for calling two other config callbacks. There are no other non-static functions that do this and it will complicate our refactoring of config_fn_t so inline it instead. Signed-off-by: Glen Choo --- builtin/branch.c | 5 ++++- builtin/clean.c | 6 ++++-- builtin/grep.c | 5 ++++- builtin/show-branch.c | 5 ++++- builtin/tag.c | 6 +++++- color.c | 8 -------- color.h | 6 +----- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 6413a016c57..c6982181fd5 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -114,7 +114,10 @@ static int git_branch_config(const char *var, const char *value, void *cb) return 0; } - return git_color_default_config(var, value, cb); + if (git_color_config(var, value, cb) < 0) + return -1; + + return git_default_config(var, value, cb); } static const char *branch_get_color(enum color_branch ix) diff --git a/builtin/clean.c b/builtin/clean.c index 14c0d555eac..a06df48a269 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -129,8 +129,10 @@ static int git_clean_config(const char *var, const char *value, void *cb) return 0; } - /* inspect the color.ui config variable and others */ - return git_color_default_config(var, value, cb); + if (git_color_config(var, value, cb) < 0) + return -1; + + return git_default_config(var, value, cb); } static const char *clean_get_color(enum color_clean ix) diff --git a/builtin/grep.c b/builtin/grep.c index a1b68d90bdb..c880c9538d6 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -290,7 +290,10 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, void *cb) { int st = grep_config(var, value, cb); - if (git_color_default_config(var, value, NULL) < 0) + + if (git_color_config(var, value, cb) < 0) + st = -1; + else if (git_default_config(var, value, cb) < 0) st = -1; if (!strcmp(var, "grep.threads")) { diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 463a8d11c31..82ae2a7e475 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -576,7 +576,10 @@ static int git_show_branch_config(const char *var, const char *value, void *cb) return 0; } - return git_color_default_config(var, value, cb); + if (git_color_config(var, value, cb) < 0) + return -1; + + return git_default_config(var, value, cb); } static int omit_in_dense(struct commit *commit, struct commit **rev, int n) diff --git a/builtin/tag.c b/builtin/tag.c index 782bb3aa2ff..7245a4d30e6 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -204,7 +204,11 @@ static int git_tag_config(const char *var, const char *value, void *cb) if (starts_with(var, "column.")) return git_column_config(var, value, "tag", &colopts); - return git_color_default_config(var, value, cb); + + if (git_color_config(var, value, cb) < 0) + return -1; + + return git_default_config(var, value, cb); } static void write_tag_body(int fd, const struct object_id *oid) diff --git a/color.c b/color.c index 672dcbb73a6..9bdbffe928d 100644 --- a/color.c +++ b/color.c @@ -427,14 +427,6 @@ int git_color_config(const char *var, const char *value, void *cb UNUSED) return 0; } -int git_color_default_config(const char *var, const char *value, void *cb) -{ - if (git_color_config(var, value, cb) < 0) - return -1; - - return git_default_config(var, value, cb); -} - void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb) { if (*color) diff --git a/color.h b/color.h index cfc8f841b23..bb28343be21 100644 --- a/color.h +++ b/color.h @@ -88,12 +88,8 @@ extern const int column_colors_ansi_max; */ extern int color_stdout_is_tty; -/* - * Use the first one if you need only color config; the second is a convenience - * if you are just going to change to git_default_config, too. - */ +/* Parse color config. */ int git_color_config(const char *var, const char *value, void *cb); -int git_color_default_config(const char *var, const char *value, void *cb); /* * Parse a config option, which can be a boolean or one of From patchwork Tue May 30 18:42:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260965 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44BE2C77B7A for ; Tue, 30 May 2023 18:42:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233383AbjE3Sm3 (ORCPT ); Tue, 30 May 2023 14:42:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233003AbjE3SmX (ORCPT ); Tue, 30 May 2023 14:42:23 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2FFB114 for ; Tue, 30 May 2023 11:42:20 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3090d3e9c92so4789099f8f.2 for ; Tue, 30 May 2023 11:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472139; x=1688064139; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=A+g+cseGWF0n6yWo2TnbosWxiSzW8KXbJjRoZoq3BCE=; b=cvvi5LRxtouQw1hT7jlNRKIqgYJhLMMkPmJg7T9PgAORrCuj1ZmF7wA4TQWoNeL5lz Kht59TBPaHKtN96gkLYoBAl2oXkYClH2whgALKSqF2iv7escngyAQvS/RTRhR42J6TuW JkYsgBWznanqVKSvykpGr+JrI9H7krwjll5xWFe2WTmIE4CJGdm++db54SR6DQOaQ+oU Un2g2O4Y6v+NuB9AU5r3Qasew2Xc05t66Sw7TYZwEDWliXRmG0D85ZuANVESTDA74c6E GVEgZvmFScatjf5WKcvlRbFkW37u5P65SXRt/OfvU85CeqQ+9nNX+wjWqqsDdw62lKZh cXDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472139; x=1688064139; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A+g+cseGWF0n6yWo2TnbosWxiSzW8KXbJjRoZoq3BCE=; b=BqWku9DkZq1LRxJvIgLyrTk7k12g5QlVSfQfRTKBJWwcvSdL2ZsL+P4qsE85FDELa7 Y0yUmMV0L0Os/kNjvgK5TA8bqtw7AuxCb861pz3/EUsYlxahTDGcRHNmqSrD8xcr44Kc 3l4Al2bGkYat5VrjQPFPPUbm0A6r4m+nelkSmE/tMQIv0qdOvU/ncx/wkF1Wof8xJSYu V0SP0GsRzAcTFfaFhPCrHZpGpYvF6iVcOhFXcudjNeenzmF70JW3o/r1dsxWZtpUVzoC /iEQhl9UvDzGWbp3j7eNBxEqX2Z/nXnu+6KqPhCN9mKPpgH2FgLmZ685heE0VrBgTsqG cdYg== X-Gm-Message-State: AC+VfDyHCHY/QdJo9jRSp192WE4BZAO8Xp3Sjf8yNKHB6WFTTN+A/9zZ 27x8WUUYvvCiDstr3vOADl16gRAO87M= X-Google-Smtp-Source: ACHHUZ5hUd/FID1MONgvbKhcXhuKiF66iOiDWkH5jYzm+/5j6de1hGmITQrsW9wokaXdbUsWJzfDOQ== X-Received: by 2002:a5d:4c82:0:b0:30a:ab38:30fe with SMTP id z2-20020a5d4c82000000b0030aab3830femr2538362wrs.43.1685472138813; Tue, 30 May 2023 11:42:18 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l12-20020a5d4bcc000000b003062b2c5255sm4188976wrt.40.2023.05.30.11.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:18 -0700 (PDT) Message-Id: <821f0b905803fe4f693a64e424a61119e97c3dce.1685472133.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:00 +0000 Subject: [PATCH v2 02/14] urlmatch.h: use config_fn_t type Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo These are actually used as config callbacks, so use the typedef-ed type and make future refactors easier. Signed-off-by: Glen Choo --- urlmatch.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/urlmatch.h b/urlmatch.h index 9f40b00bfb8..bee374a642c 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -2,6 +2,7 @@ #define URL_MATCH_H #include "string-list.h" +#include "config.h" struct url_info { /* normalized url on success, must be freed, otherwise NULL */ @@ -48,8 +49,8 @@ struct urlmatch_config { const char *key; void *cb; - int (*collect_fn)(const char *var, const char *value, void *cb); - int (*cascade_fn)(const char *var, const char *value, void *cb); + config_fn_t collect_fn; + config_fn_t cascade_fn; /* * Compare the two matches, the one just discovered and the existing * best match and return a negative value if the found item is to be From patchwork Tue May 30 18:42:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D4C6C77B73 for ; Tue, 30 May 2023 18:42:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233451AbjE3Smc (ORCPT ); Tue, 30 May 2023 14:42:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233242AbjE3SmY (ORCPT ); Tue, 30 May 2023 14:42:24 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E16D511A for ; Tue, 30 May 2023 11:42:21 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f6e1393f13so34813165e9.0 for ; Tue, 30 May 2023 11:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472140; x=1688064140; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=SoK7rHJmznOk7aNEb/vNwVXo7CynwB2gaP25Wtussu4=; b=TSv2a7hiDsROflm6Apso5nbBl5e2L9GkFCEvUFkeTA6zpzGbkduKslPi3Bn04FbvIO ZJuRU7DMvgB6RKqeQ8Z89iybl9qJU9qcYJbeh6oCIkEX0rMB6YsMPeQb6K5TpewA70nY Y0HukNR4i8sL2U+s41ShLSRUo3kUxWd2z2mMwjGPxQJYfpUBPCiRTx7Z4ULD7cegsuBc cK38/gmxce10tHzwv6Apkohsu28x/9joPp441W1eGxinTlx6bgom0RlWGWIUN7s3Uv66 pVofBECDb4ZFDVcWwa19WEjWEcFUMEw916zBrnJHW2HFujDJRJIRWuKZmdmGMsC+v/5i OC6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472140; x=1688064140; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SoK7rHJmznOk7aNEb/vNwVXo7CynwB2gaP25Wtussu4=; b=RnFH+KbYJs1F4JpEeoMSL5nv9yKqtkmjVbQB7WDUMPWkpdkHUsbh7cNnMRluvKAUU/ /+h847fwA1KekryCyT2XzHtHx904FtMCIkHbinrLHvkOBVm0Cd0ncIxZce2sW6VtvE+L ECN5Y7V2/LUVHuv7yqvnpk3Z3wRjX8mErg5fINJ3IN4UWDg0TwkOabGi9wTuqnZyHibw OprBdS5IV5BEQSF/cQXdZ7h2tUqavrDli1KTAhiqfGMch+/Uym/62T5uDifzVA9C7IVX QOaHfQe+Xa7hF56D3DdquzazYyDMWuiK4ZLS6schbfvzelkk6vQ4xZrObgnuK54HGvXQ aOKw== X-Gm-Message-State: AC+VfDz0elNonXlQvcSwJ3tgKFYtAvdbuV6WCdMFUrh94xaAjAkTpLdC GFNBIUMTut2zvWQk45qlTUPrhMW0uIs= X-Google-Smtp-Source: ACHHUZ7VB8NJk9mMNCA9bKiSA+IRKX3c2KdIFTtM7hTzvKog7RnWCun0g4sp2QQ8eJJgGo78EeUK4w== X-Received: by 2002:a1c:4b0f:0:b0:3f4:2267:10cf with SMTP id y15-20020a1c4b0f000000b003f4226710cfmr2415300wma.32.1685472139658; Tue, 30 May 2023 11:42:19 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p23-20020a05600c205700b003f42314832fsm18134040wmg.18.2023.05.30.11.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:19 -0700 (PDT) Message-Id: <6834e37066e7877646fc7c37aa79704d14381251.1685472133.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:01 +0000 Subject: [PATCH v2 03/14] (RFC-only) config: add kvi arg to config_fn_t Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo ..without actually changing any of its implementations. This commit does not build - I've split this out for readability, but post-RFC I will squash this with the rest of the refactor + cocci changes. Signed-off-by: Glen Choo --- config.c | 8 +- config.h | 16 +- .../coccinelle/config_fn_kvi.pending.cocci | 146 ++++++++++++++++++ 3 files changed, 158 insertions(+), 12 deletions(-) create mode 100644 contrib/coccinelle/config_fn_kvi.pending.cocci diff --git a/config.c b/config.c index 493f47df8ae..945f4f3b77e 100644 --- a/config.c +++ b/config.c @@ -489,7 +489,7 @@ static int git_config_include(const char *var, const char *value, void *data) * Pass along all values, including "include" directives; this makes it * possible to query information on the includes themselves. */ - ret = inc->fn(var, value, inc->data); + ret = inc->fn(var, value, NULL, inc->data); if (ret < 0) return ret; @@ -671,7 +671,7 @@ static int config_parse_pair(const char *key, const char *value, if (git_config_parse_key(key, &canonical_name, NULL)) return -1; - ret = (fn(canonical_name, value, data) < 0) ? -1 : 0; + ret = (fn(canonical_name, value, NULL, data) < 0) ? -1 : 0; free(canonical_name); return ret; } @@ -959,7 +959,7 @@ static int get_value(struct config_source *cs, config_fn_t fn, void *data, * accurate line number in error messages. */ cs->linenr--; - ret = fn(name->buf, value, data); + ret = fn(name->buf, value, NULL, data); if (ret >= 0) cs->linenr++; return ret; @@ -2303,7 +2303,7 @@ static void configset_iter(struct config_reader *reader, struct config_set *set, config_reader_set_kvi(reader, values->items[value_index].util); - if (fn(entry->key, values->items[value_index].string, data) < 0) + if (fn(entry->key, values->items[value_index].string, NULL, data) < 0) git_die_config_linenr(entry->key, reader->config_kvi->filename, reader->config_kvi->linenr); diff --git a/config.h b/config.h index 247b572b37b..9d052c52c3c 100644 --- a/config.h +++ b/config.h @@ -111,6 +111,13 @@ struct config_options { } error_action; }; +struct key_value_info { + const char *filename; + int linenr; + enum config_origin_type origin_type; + enum config_scope scope; +}; + /** * A config callback function takes three parameters: * @@ -129,7 +136,7 @@ struct config_options { * A config callback should return 0 for success, or -1 if the variable * could not be parsed properly. */ -typedef int (*config_fn_t)(const char *, const char *, void *); +typedef int (*config_fn_t)(const char *, const char *, struct key_value_info *, void *); int git_default_config(const char *, const char *, void *); @@ -667,13 +674,6 @@ int git_config_get_expiry(const char *key, const char **output); /* parse either "this many days" integer, or "5.days.ago" approxidate */ int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now); -struct key_value_info { - const char *filename; - int linenr; - enum config_origin_type origin_type; - enum config_scope scope; -}; - /** * First prints the error message specified by the caller in `err` and then * dies printing the line number and the file name of the highest priority diff --git a/contrib/coccinelle/config_fn_kvi.pending.cocci b/contrib/coccinelle/config_fn_kvi.pending.cocci new file mode 100644 index 00000000000..d4c84599afa --- /dev/null +++ b/contrib/coccinelle/config_fn_kvi.pending.cocci @@ -0,0 +1,146 @@ +// These are safe to apply to *.c *.h builtin/*.c + +@ get_fn @ +identifier fn, R; +@@ +( +( +git_config_from_file +| +git_config_from_file_with_options +| +git_config_from_mem +| +git_config_from_blob_oid +| +read_early_config +| +read_very_early_config +| +config_with_options +| +git_config +| +git_protected_config +| +config_from_gitmodules +) + (fn, ...) +| +repo_config(R, fn, ...) +) + +@ extends get_fn @ +identifier C1, C2, D; +@@ +int fn(const char *C1, const char *C2, ++ struct key_value_info *kvi, + void *D); + +@ extends get_fn @ +@@ +int fn(const char *, const char *, ++ struct key_value_info *, + void *); + +@ extends get_fn @ +// Don't change fns that look like callback fns but aren't +identifier fn2 != tar_filter_config && != git_diff_heuristic_config && + != git_default_submodule_config && != git_color_config && + != bundle_list_update && != parse_object_filter_config; +identifier C1, C2, D1, D2, S; +attribute name UNUSED; +@@ +int fn(const char *C1, const char *C2, ++ struct key_value_info *kvi, + void *D1) { +<+... +( +fn2(C1, C2, ++ kvi, +D2); +| +if(fn2(C1, C2, ++ kvi, +D2) < 0) { ... } +| +return fn2(C1, C2, ++ kvi, +D2); +| +S = fn2(C1, C2, ++ kvi, +D2); +) +...+> + } + +@ extends get_fn@ +identifier C1, C2, D; +attribute name UNUSED; +@@ +int fn(const char *C1, const char *C2, ++ struct key_value_info *kvi UNUSED, + void *D) {...} + + +// The previous rules don't catch all callbacks, especially if they're defined +// in a separate file from the git_config() call. Fix these manually. +@@ +identifier C1, C2, D; +attribute name UNUSED; +@@ +int +( +git_ident_config +| +urlmatch_collect_fn +| +write_one_config +| +forbid_remote_url +| +credential_config_callback +) + (const char *C1, const char *C2, ++ struct key_value_info *kvi UNUSED, + void *D) {...} + +@@ +identifier C1, C2, D, D2, S, fn2; +@@ +int +( +http_options +| +git_status_config +| +git_commit_config +| +git_default_core_config +| +grep_config +) + (const char *C1, const char *C2, ++ struct key_value_info *kvi, + void *D) { +<+... +( +fn2(C1, C2, ++ kvi, +D2); +| +if(fn2(C1, C2, ++ kvi, +D2) < 0) { ... } +| +return fn2(C1, C2, ++ kvi, +D2); +| +S = fn2(C1, C2, ++ kvi, +D2); +) +...+> + } From patchwork Tue May 30 18:42:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 13260972 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32033C77B7A for ; Tue, 30 May 2023 18:43:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232642AbjE3Sm6 (ORCPT ); Tue, 30 May 2023 14:42:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233351AbjE3Sm3 (ORCPT ); Tue, 30 May 2023 14:42:29 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79B3BC9 for ; Tue, 30 May 2023 11:42:23 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-30ae61354fbso2319870f8f.3 for ; Tue, 30 May 2023 11:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472141; x=1688064141; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=LbHpBh3cCAmIbNY2HXTCSq7Dt9ORjFFPZOy/N5Kt92c=; b=lk67oJlErZPF6L118uD4ZwUIe+EWcDyLKLEZOTMHlepoaQSqinySNvQI8BVlNr5Cdc ZKRIEZn+aqWVEg66Y+OFZIoLtO9uVAJ08son/4doEKn2DBohCjZBn0O1W8iCgc/Ywkqh dtDF+Sscen1j2qlZiH2h00voelknZD35uhy2Ef7aNqF8+ovrrJMuzrVI95oxiNn3NK5Y rbAB85fRfrD4tS13bHT+ZW6VTF7BOw4FCE5lOPzaq648gvsIOXmcnn4SHtlXKiB+sUpC XhngTczNv52BUWaRqWniUlRtTEiVX+Ss+JEHtq68ZCK9eUnv6TN7SLXD9orUyXMizmRS UqeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472141; x=1688064141; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LbHpBh3cCAmIbNY2HXTCSq7Dt9ORjFFPZOy/N5Kt92c=; b=A/wlhmyhnrrNpUrBEDkCnQCdwKVMAo0z//U9jrBUkbAdH4vgR3d5WWQNff0BS+v2Xh Ouwei7N4zqedH5LUh0Nu2rHzX+21D13+MYb0+xtwCaGwtsOZN3JgJZ9EtMLedUCEFkUo iYziQy/i/5b6g8ZDtjmKcljLFoDDI15pMin1zvW3kx4amj2ZOxfDDgvr8uevmTnzkj0a giCWOINa5/QpLwtrHe7AFhT5hR59zCWB06iNo8Ja7XnU7PwO1Yzsx7lpzyg0gu1a/MLs JPX9zBQJHPYtNjvh/hg7EybiZmrbt5Zwufk2cLMTFIfBeCOi11qsWRiLdSvwcaaohtUE kKhA== X-Gm-Message-State: AC+VfDyzFR8sHY+o/8pQ9EGvLZ5x5t80A14r6Ry+Fmlq/pws9z8dFl+I ByBZRFhAXXmthuRqTj92xKcF8Zph4BY= X-Google-Smtp-Source: ACHHUZ674U0QqhSngLmcryFCXjXRffbNnwyZ2j8y4ZZ5/DzxB4K3K/XkQxLOB04sqYtHtQIP4S2RZg== X-Received: by 2002:a5d:5144:0:b0:30a:e8e8:c172 with SMTP id u4-20020a5d5144000000b0030ae8e8c172mr2390967wrt.26.1685472140744; Tue, 30 May 2023 11:42:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o1-20020a5d4741000000b002f9e04459desm4077873wrs.109.2023.05.30.11.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:20 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Glen Choo via GitGitGadget" Date: Tue, 30 May 2023 18:42:02 +0000 Subject: [PATCH v2 04/14] (RFC-only) config: apply cocci to config_fn_t implementations Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo Pass "struct key_value_info" to *most* functions that are invoked as "config_fn_t" callbacks by applying contrib/coccinelle/config_fn_kvi.pending.cocci. None of the functions actually use the "kvi" arg yet (besides propagating it to a function that now expects "kvi"), but this will be addressed in a later commit. When deciding whether or not to propagate "kvi" to an inner function, only propagate the "kvi" arg if the inner function is actually invoked elsewhere as a config callback; it does not matter whether the function happens have the same signature as config_fn_t. This commit does not build and has several style issues (e.g. a lack of spacing around the "kvi" arg), but I've split this out for the RFC so that it's more obvious which changes are automatic vs manual. Post-RFC I will squash this with the rest of the refactor + cocci changes. Signed-off-by: Glen Choo --- alias.c | 3 ++- archive-tar.c | 3 ++- archive-zip.c | 1 + builtin/add.c | 5 +++-- builtin/blame.c | 5 +++-- builtin/branch.c | 5 +++-- builtin/cat-file.c | 5 +++-- builtin/checkout.c | 5 +++-- builtin/clean.c | 5 +++-- builtin/clone.c | 8 +++++--- builtin/column.c | 3 ++- builtin/commit-graph.c | 1 + builtin/commit.c | 10 ++++++---- builtin/config.c | 10 +++++++--- builtin/difftool.c | 5 +++-- builtin/fetch.c | 8 +++++--- builtin/fsmonitor--daemon.c | 5 +++-- builtin/grep.c | 5 +++-- builtin/help.c | 5 +++-- builtin/index-pack.c | 5 +++-- builtin/log.c | 10 ++++++---- builtin/merge.c | 7 ++++--- builtin/multi-pack-index.c | 1 + builtin/pack-objects.c | 5 +++-- builtin/patch-id.c | 5 +++-- builtin/pull.c | 5 +++-- builtin/push.c | 5 +++-- builtin/read-tree.c | 5 +++-- builtin/rebase.c | 5 +++-- builtin/receive-pack.c | 5 +++-- builtin/reflog.c | 7 ++++--- builtin/remote.c | 6 ++++-- builtin/repack.c | 5 +++-- builtin/reset.c | 5 +++-- builtin/send-pack.c | 5 +++-- builtin/show-branch.c | 5 +++-- builtin/stash.c | 5 +++-- builtin/submodule--helper.c | 1 + builtin/tag.c | 5 +++-- builtin/var.c | 5 +++-- builtin/worktree.c | 5 +++-- bundle-uri.c | 8 ++++++-- config.c | 28 ++++++++++++++++++---------- config.h | 3 ++- connect.c | 4 ++-- convert.c | 4 +++- credential.c | 1 + delta-islands.c | 3 ++- diff.c | 10 ++++++---- diff.h | 6 ++++-- fetch-pack.c | 5 +++-- fmt-merge-msg.c | 5 +++-- fmt-merge-msg.h | 3 ++- fsck.c | 8 +++++--- fsck.h | 3 ++- gpg-interface.c | 6 ++++-- grep.c | 3 ++- help.c | 7 +++++-- ident.c | 3 ++- ident.h | 3 ++- imap-send.c | 5 +++-- ll-merge.c | 1 + ls-refs.c | 2 +- mailinfo.c | 5 +++-- notes-utils.c | 3 ++- notes.c | 3 ++- pager.c | 5 ++++- pretty.c | 1 + promisor-remote.c | 4 +++- remote.c | 3 ++- revision.c | 3 ++- scalar.c | 3 ++- sequencer.c | 8 +++++--- setup.c | 15 ++++++++++----- submodule-config.c | 15 +++++++++++---- t/helper/test-config.c | 9 ++++++--- t/helper/test-userdiff.c | 4 +++- trace2/tr2_cfg.c | 3 ++- trace2/tr2_sysenv.c | 3 ++- trailer.c | 2 ++ upload-pack.c | 8 ++++++-- urlmatch.c | 3 ++- urlmatch.h | 3 ++- xdiff-interface.c | 5 +++-- xdiff-interface.h | 3 ++- 85 files changed, 285 insertions(+), 156 deletions(-) diff --git a/alias.c b/alias.c index e814948ced3..38c51038a13 100644 --- a/alias.c +++ b/alias.c @@ -11,7 +11,8 @@ struct config_alias_data { struct string_list *list; }; -static int config_alias_cb(const char *key, const char *value, void *d) +static int config_alias_cb(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *d) { struct config_alias_data *data = d; const char *p; diff --git a/archive-tar.c b/archive-tar.c index 497dad0b3af..dcfbce5225a 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -410,7 +410,8 @@ static int tar_filter_config(const char *var, const char *value, return 0; } -static int git_tar_config(const char *var, const char *value, void *cb) +static int git_tar_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { if (!strcmp(var, "tar.umask")) { if (value && !strcmp(value, "user")) { diff --git a/archive-zip.c b/archive-zip.c index e6f5c10a14f..0b028246689 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -616,6 +616,7 @@ static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time) } static int archive_zip_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data UNUSED) { return userdiff_config(var, value); diff --git a/builtin/add.c b/builtin/add.c index f12054d9be1..f8e42e05b07 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -355,7 +355,8 @@ static struct option builtin_add_options[] = { OPT_END(), }; -static int add_config(const char *var, const char *value, void *cb) +static int add_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "add.ignoreerrors") || !strcmp(var, "add.ignore-errors")) { @@ -363,7 +364,7 @@ static int add_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static const char embedded_advice[] = N_( diff --git a/builtin/blame.c b/builtin/blame.c index a8d2114adc9..0aafc8172e2 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -692,7 +692,8 @@ static const char *add_prefix(const char *prefix, const char *path) return prefix_path(prefix, prefix ? strlen(prefix) : 0, path); } -static int git_blame_config(const char *var, const char *value, void *cb) +static int git_blame_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "blame.showroot")) { show_root = git_config_bool(var, value); @@ -765,7 +766,7 @@ static int git_blame_config(const char *var, const char *value, void *cb) if (userdiff_config(var, value) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static int blame_copy_callback(const struct option *option, const char *arg, int unset) diff --git a/builtin/branch.c b/builtin/branch.c index c6982181fd5..26091a036d2 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -80,7 +80,8 @@ static unsigned int colopts; define_list_config_array(color_branch_slots); -static int git_branch_config(const char *var, const char *value, void *cb) +static int git_branch_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { const char *slot_name; @@ -117,7 +118,7 @@ static int git_branch_config(const char *var, const char *value, void *cb) if (git_color_config(var, value, cb) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static const char *branch_get_color(enum color_branch ix) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 04d4bb6c777..b1e0e95d631 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -882,12 +882,13 @@ static int batch_objects(struct batch_options *opt) return retval; } -static int git_cat_file_config(const char *var, const char *value, void *cb) +static int git_cat_file_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (userdiff_config(var, value) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static int batch_option_callback(const struct option *opt, diff --git a/builtin/checkout.c b/builtin/checkout.c index 38a8cd6a965..92017ba6696 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1182,7 +1182,8 @@ static int switch_branches(const struct checkout_opts *opts, return ret || writeout_error; } -static int git_checkout_config(const char *var, const char *value, void *cb) +static int git_checkout_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { struct checkout_opts *opts = cb; @@ -1198,7 +1199,7 @@ static int git_checkout_config(const char *var, const char *value, void *cb) if (starts_with(var, "submodule.")) return git_default_submodule_config(var, value, NULL); - return git_xmerge_config(var, value, NULL); + return git_xmerge_config(var, value,kvi, NULL); } static void setup_new_branch_info_and_source_tree( diff --git a/builtin/clean.c b/builtin/clean.c index a06df48a269..1c648276ebf 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -102,7 +102,8 @@ struct menu_stuff { define_list_config_array(color_interactive_slots); -static int git_clean_config(const char *var, const char *value, void *cb) +static int git_clean_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { const char *slot_name; @@ -132,7 +133,7 @@ static int git_clean_config(const char *var, const char *value, void *cb) if (git_color_config(var, value, cb) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static const char *clean_get_color(enum color_clean ix) diff --git a/builtin/clone.c b/builtin/clone.c index 6dc89f1058b..1e1cf104194 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -775,7 +775,8 @@ static int checkout(int submodule_progress, int filter_submodules) return err; } -static int git_clone_config(const char *k, const char *v, void *cb) +static int git_clone_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { if (!strcmp(k, "clone.defaultremotename")) { free(remote_name); @@ -786,10 +787,11 @@ static int git_clone_config(const char *k, const char *v, void *cb) if (!strcmp(k, "clone.filtersubmodules")) config_filter_submodules = git_config_bool(k, v); - return git_default_config(k, v, cb); + return git_default_config(k, v,kvi, cb); } -static int write_one_config(const char *key, const char *value, void *data) +static int write_one_config(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *data) { /* * give git_clone_config a chance to write config values back to the diff --git a/builtin/column.c b/builtin/column.c index de623a16c2d..30cfbed62ec 100644 --- a/builtin/column.c +++ b/builtin/column.c @@ -13,7 +13,8 @@ static const char * const builtin_column_usage[] = { }; static unsigned int colopts; -static int column_config(const char *var, const char *value, void *cb) +static int column_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { return git_column_config(var, value, cb, &colopts); } diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 90114269761..e811866b5dd 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -185,6 +185,7 @@ static int write_option_max_new_filters(const struct option *opt, } static int git_commit_graph_write_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { if (!strcmp(var, "commitgraph.maxnewfilters")) diff --git a/builtin/commit.c b/builtin/commit.c index 9d8e1ea91a3..ec468e87039 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1402,7 +1402,8 @@ static int parse_status_slot(const char *slot) return LOOKUP_CONFIG(color_status_slots, slot); } -static int git_status_config(const char *k, const char *v, void *cb) +static int git_status_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { struct wt_status *s = cb; const char *slot_name; @@ -1487,7 +1488,7 @@ static int git_status_config(const char *k, const char *v, void *cb) s->detect_rename = git_config_rename(k, v); return 0; } - return git_diff_ui_config(k, v, NULL); + return git_diff_ui_config(k, v,kvi, NULL); } int cmd_status(int argc, const char **argv, const char *prefix) @@ -1602,7 +1603,8 @@ int cmd_status(int argc, const char **argv, const char *prefix) return 0; } -static int git_commit_config(const char *k, const char *v, void *cb) +static int git_commit_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { struct wt_status *s = cb; @@ -1624,7 +1626,7 @@ static int git_commit_config(const char *k, const char *v, void *cb) return 0; } - return git_status_config(k, v, s); + return git_status_config(k, v,kvi, s); } int cmd_commit(int argc, const char **argv, const char *prefix) diff --git a/builtin/config.c b/builtin/config.c index fe79fb60c43..b2ad7351d0a 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -214,7 +214,7 @@ static void show_config_scope(struct strbuf *buf) } static int show_all_config(const char *key_, const char *value_, - void *cb UNUSED) + struct key_value_info *kvi UNUSED, void *cb UNUSED) { if (show_origin || show_scope) { struct strbuf buf = STRBUF_INIT; @@ -298,7 +298,8 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value return 0; } -static int collect_config(const char *key_, const char *value_, void *cb) +static int collect_config(const char *key_, const char *value_, + struct key_value_info *kvi UNUSED, void *cb) { struct strbuf_list *values = cb; @@ -466,6 +467,7 @@ static const char *get_colorbool_slot; static char parsed_color[COLOR_MAXLEN]; static int git_get_color_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { if (!strcmp(var, get_color_slot)) { @@ -498,6 +500,7 @@ static int get_colorbool_found; static int get_diff_color_found; static int get_color_ui_found; static int git_get_colorbool_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data UNUSED) { if (!strcmp(var, get_colorbool_slot)) @@ -555,7 +558,8 @@ struct urlmatch_current_candidate_value { struct strbuf value; }; -static int urlmatch_collect_fn(const char *var, const char *value, void *cb) +static int urlmatch_collect_fn(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { struct string_list *values = cb; struct string_list_item *item = string_list_insert(values, var); diff --git a/builtin/difftool.c b/builtin/difftool.c index e010a21bfbc..d4d149bcf6b 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -38,14 +38,15 @@ static const char *const builtin_difftool_usage[] = { NULL }; -static int difftool_config(const char *var, const char *value, void *cb) +static int difftool_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "difftool.trustexitcode")) { trust_exit_code = git_config_bool(var, value); return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static int print_tool_help(void) diff --git a/builtin/fetch.c b/builtin/fetch.c index 85bd2801036..aa688291613 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -100,7 +100,8 @@ static int fetch_write_commit_graph = -1; static int stdin_refspecs = 0; static int negotiate_only; -static int git_fetch_config(const char *k, const char *v, void *cb) +static int git_fetch_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { if (!strcmp(k, "fetch.prune")) { fetch_prune_config = git_config_bool(k, v); @@ -140,7 +141,7 @@ static int git_fetch_config(const char *k, const char *v, void *cb) return 0; } - return git_default_config(k, v, cb); + return git_default_config(k, v,kvi, cb); } static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) @@ -1828,7 +1829,8 @@ struct remote_group_data { struct string_list *list; }; -static int get_remote_group(const char *key, const char *value, void *priv) +static int get_remote_group(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *priv) { struct remote_group_data *g = priv; diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 42af6a2cc7e..a7375d61d02 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -36,7 +36,8 @@ static int fsmonitor__start_timeout_sec = 60; #define FSMONITOR__ANNOUNCE_STARTUP "fsmonitor.announcestartup" static int fsmonitor__announce_startup = 0; -static int fsmonitor_config(const char *var, const char *value, void *cb) +static int fsmonitor_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, FSMONITOR__IPC_THREADS)) { int i = git_config_int(var, value); @@ -66,7 +67,7 @@ static int fsmonitor_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } /* diff --git a/builtin/grep.c b/builtin/grep.c index c880c9538d6..177befc3ed4 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -287,13 +287,14 @@ static int wait_all(void) return hit; } -static int grep_cmd_config(const char *var, const char *value, void *cb) +static int grep_cmd_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { int st = grep_config(var, value, cb); if (git_color_config(var, value, cb) < 0) st = -1; - else if (git_default_config(var, value, cb) < 0) + else if (git_default_config(var, value,kvi, cb) < 0) st = -1; if (!strcmp(var, "grep.threads")) { diff --git a/builtin/help.c b/builtin/help.c index 87333a02ec4..5d4a86c4b41 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -396,7 +396,8 @@ static int add_man_viewer_info(const char *var, const char *value) return 0; } -static int git_help_config(const char *var, const char *value, void *cb) +static int git_help_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "help.format")) { if (!value) @@ -419,7 +420,7 @@ static int git_help_config(const char *var, const char *value, void *cb) if (starts_with(var, "man.")) return add_man_viewer_info(var, value); - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static struct cmdnames main_cmds, other_cmds; diff --git a/builtin/index-pack.c b/builtin/index-pack.c index b17e79cd40f..4450510ddfc 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1578,7 +1578,8 @@ static void final(const char *final_pack_name, const char *curr_pack_name, strbuf_release(&pack_name); } -static int git_index_pack_config(const char *k, const char *v, void *cb) +static int git_index_pack_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { struct pack_idx_option *opts = cb; @@ -1605,7 +1606,7 @@ static int git_index_pack_config(const char *k, const char *v, void *cb) else opts->flags &= ~WRITE_REV; } - return git_default_config(k, v, cb); + return git_default_config(k, v,kvi, cb); } static int cmp_uint32(const void *a_, const void *b_) diff --git a/builtin/log.c b/builtin/log.c index 7d195789633..f8e61330491 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -559,7 +559,8 @@ static int cmd_log_walk(struct rev_info *rev) return retval; } -static int git_log_config(const char *var, const char *value, void *cb) +static int git_log_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { const char *slot_name; @@ -608,7 +609,7 @@ static int git_log_config(const char *var, const char *value, void *cb) return 0; } - return git_diff_ui_config(var, value, cb); + return git_diff_ui_config(var, value,kvi, cb); } int cmd_whatchanged(int argc, const char **argv, const char *prefix) @@ -974,7 +975,8 @@ static enum cover_from_description parse_cover_from_description(const char *arg) die(_("%s: invalid cover from description mode"), arg); } -static int git_format_config(const char *var, const char *value, void *cb) +static int git_format_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "format.headers")) { if (!value) @@ -1103,7 +1105,7 @@ static int git_format_config(const char *var, const char *value, void *cb) if (!strcmp(var, "diff.noprefix")) return 0; - return git_log_config(var, value, cb); + return git_log_config(var, value,kvi, cb); } static const char *output_directory = NULL; diff --git a/builtin/merge.c b/builtin/merge.c index a99be9610e9..492a83a900c 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -620,7 +620,8 @@ static void parse_branch_merge_options(char *bmo) free(argv); } -static int git_merge_config(const char *k, const char *v, void *cb) +static int git_merge_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { int status; const char *str; @@ -665,10 +666,10 @@ static int git_merge_config(const char *k, const char *v, void *cb) return 0; } - status = fmt_merge_msg_config(k, v, cb); + status = fmt_merge_msg_config(k, v,kvi, cb); if (status) return status; - return git_diff_ui_config(k, v, cb); + return git_diff_ui_config(k, v,kvi, cb); } static int read_tree_trivial(struct object_id *common, struct object_id *head, diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 1b5083f8b26..c3cd7163c84 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -82,6 +82,7 @@ static struct option *add_common_options(struct option *prev) } static int git_multi_pack_index_write_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { if (!strcmp(var, "pack.writebitmaphashcache")) { diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 77d88f85b04..ca023000cc0 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3134,7 +3134,8 @@ static void prepare_pack(int window, int depth) free(delta_list); } -static int git_pack_config(const char *k, const char *v, void *cb) +static int git_pack_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { if (!strcmp(k, "pack.window")) { window = git_config_int(k, v); @@ -3226,7 +3227,7 @@ static int git_pack_config(const char *k, const char *v, void *cb) ex->uri = xstrdup(pack_end + 1); oidmap_put(&configured_exclusions, ex); } - return git_default_config(k, v, cb); + return git_default_config(k, v,kvi, cb); } /* Counters for trace2 output when in --stdin-packs mode. */ diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 9d5585d3a72..9b4f5a71b87 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -196,7 +196,8 @@ struct patch_id_opts { int verbatim; }; -static int git_patch_id_config(const char *var, const char *value, void *cb) +static int git_patch_id_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { struct patch_id_opts *opts = cb; @@ -209,7 +210,7 @@ static int git_patch_id_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } int cmd_patch_id(int argc, const char **argv, const char *prefix) diff --git a/builtin/pull.c b/builtin/pull.c index 5405d09f22f..1b244eee67c 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -359,7 +359,8 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified) /** * Read config variables. */ -static int git_pull_config(const char *var, const char *value, void *cb) +static int git_pull_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "rebase.autostash")) { config_autostash = git_config_bool(var, value); @@ -372,7 +373,7 @@ static int git_pull_config(const char *var, const char *value, void *cb) check_trust_level = 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } /** diff --git a/builtin/push.c b/builtin/push.c index fa550b8f80a..65b79378b92 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -506,7 +506,8 @@ static void set_push_cert_flags(int *flags, int v) } -static int git_push_config(const char *k, const char *v, void *cb) +static int git_push_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { const char *slot_name; int *flags = cb; @@ -573,7 +574,7 @@ static int git_push_config(const char *k, const char *v, void *cb) return 0; } - return git_default_config(k, v, NULL); + return git_default_config(k, v,kvi, NULL); } int cmd_push(int argc, const char **argv, const char *prefix) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 600d4f748fc..e9859b6157e 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -100,12 +100,13 @@ static int debug_merge(const struct cache_entry * const *stages, return 0; } -static int git_read_tree_config(const char *var, const char *value, void *cb) +static int git_read_tree_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "submodule.recurse")) return git_default_submodule_config(var, value, cb); - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) diff --git a/builtin/rebase.c b/builtin/rebase.c index 680fe3c1453..1fd05d708b8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -791,7 +791,8 @@ static void parse_rebase_merges_value(struct rebase_options *options, const char die(_("Unknown rebase-merges mode: %s"), value); } -static int rebase_config(const char *var, const char *value, void *data) +static int rebase_config(const char *var, const char *value, + struct key_value_info *kvi, void *data) { struct rebase_options *opts = data; @@ -850,7 +851,7 @@ static int rebase_config(const char *var, const char *value, void *data) return git_config_string(&opts->default_backend, var, value); } - return git_default_config(var, value, data); + return git_default_config(var, value,kvi, data); } static int checkout_up_to_date(struct rebase_options *options) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 9109552533d..2f5fd2abbc3 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -135,7 +135,8 @@ static enum deny_action parse_deny_action(const char *var, const char *value) return DENY_IGNORE; } -static int receive_pack_config(const char *var, const char *value, void *cb) +static int receive_pack_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { int status = parse_hide_refs_config(var, value, "receive", &hidden_refs); @@ -262,7 +263,7 @@ static int receive_pack_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static void show_ref(const char *path, const struct object_id *oid) diff --git a/builtin/reflog.c b/builtin/reflog.c index a1fa0c855f4..ecf21ac9c6e 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -108,7 +108,8 @@ static struct reflog_expire_cfg *find_cfg_ent(const char *pattern, size_t len) #define EXPIRE_TOTAL 01 #define EXPIRE_UNREACH 02 -static int reflog_expire_config(const char *var, const char *value, void *cb) +static int reflog_expire_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { const char *pattern, *key; size_t pattern_len; @@ -117,7 +118,7 @@ static int reflog_expire_config(const char *var, const char *value, void *cb) struct reflog_expire_cfg *ent; if (parse_config_key(var, "gc", &pattern, &pattern_len, &key) < 0) - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); if (!strcmp(key, "reflogexpire")) { slot = EXPIRE_TOTAL; @@ -128,7 +129,7 @@ static int reflog_expire_config(const char *var, const char *value, void *cb) if (git_config_expiry_date(&expire, var, value)) return -1; } else - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); if (!pattern) { switch (slot) { diff --git a/builtin/remote.c b/builtin/remote.c index 1e0b137d977..edb4a9ddd7f 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -268,6 +268,7 @@ static const char *abbrev_ref(const char *name, const char *prefix) #define abbrev_branch(name) abbrev_ref((name), "refs/heads/") static int config_read_branches(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *data UNUSED) { const char *orig_key = key; @@ -645,7 +646,7 @@ struct push_default_info }; static int config_read_push_default(const char *key, const char *value, - void *cb) + struct key_value_info *kvi UNUSED, void *cb) { struct push_default_info* info = cb; if (strcmp(key, "remote.pushdefault") || @@ -1494,7 +1495,8 @@ static int prune(int argc, const char **argv, const char *prefix) return result; } -static int get_remote_default(const char *key, const char *value UNUSED, void *priv) +static int get_remote_default(const char *key, const char *value UNUSED, + struct key_value_info *kvi UNUSED, void *priv) { if (strcmp(key, "remotes.default") == 0) { int *found = priv; diff --git a/builtin/repack.c b/builtin/repack.c index df4d8e0f0ba..7c8401b2227 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -58,7 +58,8 @@ struct pack_objects_args { int local; }; -static int repack_config(const char *var, const char *value, void *cb) +static int repack_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { struct pack_objects_args *cruft_po_args = cb; if (!strcmp(var, "repack.usedeltabaseoffset")) { @@ -90,7 +91,7 @@ static int repack_config(const char *var, const char *value, void *cb) return git_config_string(&cruft_po_args->depth, var, value); if (!strcmp(var, "repack.cruftthreads")) return git_config_string(&cruft_po_args->threads, var, value); - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } /* diff --git a/builtin/reset.c b/builtin/reset.c index 0ed329236c8..a04d46d7fdd 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -308,12 +308,13 @@ static int reset_refs(const char *rev, const struct object_id *oid) return update_ref_status; } -static int git_reset_config(const char *var, const char *value, void *cb) +static int git_reset_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "submodule.recurse")) return git_default_submodule_config(var, value, cb); - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } int cmd_reset(int argc, const char **argv, const char *prefix) diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 4784143004d..b0c90e549b8 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -131,7 +131,8 @@ static void print_helper_status(struct ref *ref) strbuf_release(&buf); } -static int send_pack_config(const char *k, const char *v, void *cb) +static int send_pack_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { if (!strcmp(k, "push.gpgsign")) { const char *value; @@ -151,7 +152,7 @@ static int send_pack_config(const char *k, const char *v, void *cb) } } } - return git_default_config(k, v, cb); + return git_default_config(k, v,kvi, cb); } int cmd_send_pack(int argc, const char **argv, const char *prefix) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 82ae2a7e475..ad8a391904e 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -556,7 +556,8 @@ static void append_one_rev(const char *av) die("bad sha1 reference %s", av); } -static int git_show_branch_config(const char *var, const char *value, void *cb) +static int git_show_branch_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "showbranch.default")) { if (!value) @@ -579,7 +580,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb) if (git_color_config(var, value, cb) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static int omit_in_dense(struct commit *commit, struct commit **rev, int n) diff --git a/builtin/stash.c b/builtin/stash.c index 735d27039e1..689087d6240 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -836,7 +836,8 @@ static int show_stat = 1; static int show_patch; static int show_include_untracked; -static int git_stash_config(const char *var, const char *value, void *cb) +static int git_stash_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "stash.showstat")) { show_stat = git_config_bool(var, value); @@ -850,7 +851,7 @@ static int git_stash_config(const char *var, const char *value, void *cb) show_include_untracked = git_config_bool(var, value); return 0; } - return git_diff_basic_config(var, value, cb); + return git_diff_basic_config(var, value,kvi, cb); } static void diff_include_untracked(const struct stash_info *info, struct diff_options *diff_opt) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 569068e6a2c..8570effbf0d 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2187,6 +2187,7 @@ static int update_clone_task_finished(int result, } static int git_update_clone_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { int *max_jobs = cb; diff --git a/builtin/tag.c b/builtin/tag.c index 7245a4d30e6..626fe8c641e 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -183,7 +183,8 @@ static const char tag_template_nocleanup[] = "Lines starting with '%c' will be kept; you may remove them" " yourself if you want to.\n"); -static int git_tag_config(const char *var, const char *value, void *cb) +static int git_tag_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "tag.gpgsign")) { config_sign_tag = git_config_bool(var, value); @@ -208,7 +209,7 @@ static int git_tag_config(const char *var, const char *value, void *cb) if (git_color_config(var, value, cb) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static void write_tag_body(int fd, const struct object_id *oid) diff --git a/builtin/var.c b/builtin/var.c index acb988d2d56..440add19bb5 100644 --- a/builtin/var.c +++ b/builtin/var.c @@ -69,13 +69,14 @@ static const struct git_var *get_git_var(const char *var) return NULL; } -static int show_config(const char *var, const char *value, void *cb) +static int show_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (value) printf("%s=%s\n", var, value); else printf("%s\n", var); - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } int cmd_var(int argc, const char **argv, const char *prefix UNUSED) diff --git a/builtin/worktree.c b/builtin/worktree.c index 39e9e5c9ce8..d5ccd741e87 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -103,14 +103,15 @@ static int verbose; static int guess_remote; static timestamp_t expire; -static int git_worktree_config(const char *var, const char *value, void *cb) +static int git_worktree_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "worktree.guessremote")) { guess_remote = git_config_bool(var, value); return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static int delete_git_dir(const char *id) diff --git a/bundle-uri.c b/bundle-uri.c index e2b267cc02b..7f01fbbff74 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -223,7 +223,9 @@ static int bundle_list_update(const char *key, const char *value, return 0; } -static int config_to_bundle_list(const char *key, const char *value, void *data) +static int config_to_bundle_list(const char *key, const char *value, + struct key_value_info *kvi UNUSED, + void *data) { struct bundle_list *list = data; return bundle_list_update(key, value, list); @@ -870,7 +872,9 @@ cached: return advertise_bundle_uri; } -static int config_to_packet_line(const char *key, const char *value, void *data) +static int config_to_packet_line(const char *key, const char *value, + struct key_value_info *kvi UNUSED, + void *data) { struct packet_reader *writer = data; diff --git a/config.c b/config.c index 945f4f3b77e..1bc2e35a3e0 100644 --- a/config.c +++ b/config.c @@ -201,7 +201,8 @@ struct config_include_data { }; #define CONFIG_INCLUDE_INIT { 0 } -static int git_config_include(const char *var, const char *value, void *data); +static int git_config_include(const char *var, const char *value, + struct key_value_info *kvi, void *data); #define MAX_INCLUDE_DEPTH 10 static const char include_depth_advice[] = N_( @@ -380,7 +381,8 @@ static int include_by_branch(const char *cond, size_t cond_len) return ret; } -static int add_remote_url(const char *var, const char *value, void *data) +static int add_remote_url(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct string_list *remote_urls = data; const char *remote_name; @@ -414,6 +416,7 @@ static void populate_remote_urls(struct config_include_data *inc) } static int forbid_remote_url(const char *var, const char *value UNUSED, + struct key_value_info *kvi UNUSED, void *data UNUSED) { const char *remote_name; @@ -477,7 +480,8 @@ static int include_condition_is_true(struct config_source *cs, return 0; } -static int git_config_include(const char *var, const char *value, void *data) +static int git_config_include(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct config_include_data *inc = data; struct config_source *cs = inc->config_reader->source; @@ -1553,7 +1557,8 @@ int git_config_color(char *dest, const char *var, const char *value) return 0; } -static int git_default_core_config(const char *var, const char *value, void *cb) +static int git_default_core_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { /* This needs a better name */ if (!strcmp(var, "core.filemode")) { @@ -1838,7 +1843,7 @@ static int git_default_core_config(const char *var, const char *value, void *cb) } /* Add other config variables here and to Documentation/config.txt. */ - return platform_core_config(var, value, cb); + return platform_core_config(var, value,kvi, cb); } static int git_default_sparse_config(const char *var, const char *value) @@ -1940,15 +1945,16 @@ static int git_default_mailmap_config(const char *var, const char *value) return 0; } -int git_default_config(const char *var, const char *value, void *cb) +int git_default_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (starts_with(var, "core.")) - return git_default_core_config(var, value, cb); + return git_default_core_config(var, value,kvi, cb); if (starts_with(var, "user.") || starts_with(var, "author.") || starts_with(var, "committer.")) - return git_ident_config(var, value, cb); + return git_ident_config(var, value,kvi, cb); if (starts_with(var, "i18n.")) return git_default_i18n_config(var, value); @@ -2481,7 +2487,8 @@ struct configset_add_data { }; #define CONFIGSET_ADD_INIT { 0 } -static int config_set_callback(const char *key, const char *value, void *cb) +static int config_set_callback(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { struct configset_add_data *data = cb; configset_add_value(data->config_reader, data->config_set, key, value); @@ -3091,7 +3098,8 @@ static int store_aux_event(enum config_event_t type, return 0; } -static int store_aux(const char *key, const char *value, void *cb) +static int store_aux(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { struct config_store_data *store = cb; diff --git a/config.h b/config.h index 9d052c52c3c..9e0c1f12165 100644 --- a/config.h +++ b/config.h @@ -138,7 +138,8 @@ struct key_value_info { */ typedef int (*config_fn_t)(const char *, const char *, struct key_value_info *, void *); -int git_default_config(const char *, const char *, void *); +int git_default_config(const char *, const char *, struct key_value_info *, + void *); /** * Read a specific file in git-config format. diff --git a/connect.c b/connect.c index c0c8a38178c..72aad67a288 100644 --- a/connect.c +++ b/connect.c @@ -962,7 +962,7 @@ static struct child_process *git_tcp_connect(int fd[2], char *host, int flags) static char *git_proxy_command; static int git_proxy_command_options(const char *var, const char *value, - void *cb) + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "core.gitproxy")) { const char *for_pos; @@ -1008,7 +1008,7 @@ static int git_proxy_command_options(const char *var, const char *value, return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static int git_use_proxy(const char *host) diff --git a/convert.c b/convert.c index da06e2f51cb..a563380e7e7 100644 --- a/convert.c +++ b/convert.c @@ -1011,7 +1011,9 @@ static int apply_filter(const char *path, const char *src, size_t len, return 0; } -static int read_convert_config(const char *var, const char *value, void *cb UNUSED) +static int read_convert_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *cb UNUSED) { const char *key, *name; size_t namelen; diff --git a/credential.c b/credential.c index e6417bf8804..6b9b8bfbb79 100644 --- a/credential.c +++ b/credential.c @@ -46,6 +46,7 @@ static int credential_from_potentially_partial_url(struct credential *c, const char *url); static int credential_config_callback(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct credential *c = data; diff --git a/delta-islands.c b/delta-islands.c index 40f2ccfb550..404f9c07a42 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -341,7 +341,8 @@ static void free_remote_islands(kh_str_t *remote_islands) kh_destroy_str(remote_islands); } -static int island_config_callback(const char *k, const char *v, void *cb) +static int island_config_callback(const char *k, const char *v, + struct key_value_info *kvi UNUSED, void *cb) { struct island_load_data *ild = cb; diff --git a/diff.c b/diff.c index 78b0fdd8caa..d7ed2dc900b 100644 --- a/diff.c +++ b/diff.c @@ -350,7 +350,8 @@ static unsigned parse_color_moved_ws(const char *arg) return ret; } -int git_diff_ui_config(const char *var, const char *value, void *cb) +int git_diff_ui_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { diff_use_color_default = git_config_colorbool(var, value); @@ -433,10 +434,11 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) if (git_color_config(var, value, cb) < 0) return -1; - return git_diff_basic_config(var, value, cb); + return git_diff_basic_config(var, value,kvi, cb); } -int git_diff_basic_config(const char *var, const char *value, void *cb) +int git_diff_basic_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { const char *name; @@ -488,7 +490,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) if (git_diff_heuristic_config(var, value, cb) < 0) return -1; - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static char *quote_two(const char *one, const char *two) diff --git a/diff.h b/diff.h index 6a0737b9c34..6a3efa63753 100644 --- a/diff.h +++ b/diff.h @@ -532,10 +532,12 @@ void free_diffstat_info(struct diffstat_t *diffstat); int parse_long_opt(const char *opt, const char **argv, const char **optarg); -int git_diff_basic_config(const char *var, const char *value, void *cb); +int git_diff_basic_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb); int git_diff_heuristic_config(const char *var, const char *value, void *cb); void init_diff_ui_defaults(void); -int git_diff_ui_config(const char *var, const char *value, void *cb); +int git_diff_ui_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb); void repo_diff_setup(struct repository *, struct diff_options *); struct option *add_diff_options(const struct option *, struct diff_options *); int diff_opt_parse(struct diff_options *, const char **, int, const char *); diff --git a/fetch-pack.c b/fetch-pack.c index 368f2ed25a1..c1072aa6cac 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1858,7 +1858,8 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, return ref; } -static int fetch_pack_config_cb(const char *var, const char *value, void *cb) +static int fetch_pack_config_cb(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (strcmp(var, "fetch.fsck.skiplist") == 0) { const char *path; @@ -1880,7 +1881,7 @@ static int fetch_pack_config_cb(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } static void fetch_pack_config(void) diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 1886c92ddb9..97358034fa0 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -19,7 +19,8 @@ static int use_branch_desc; static int suppress_dest_pattern_seen; static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP; -int fmt_merge_msg_config(const char *key, const char *value, void *cb) +int fmt_merge_msg_config(const char *key, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { int is_bool; @@ -39,7 +40,7 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb) string_list_append(&suppress_dest_patterns, value); suppress_dest_pattern_seen = 1; } else { - return git_default_config(key, value, cb); + return git_default_config(key, value,kvi, cb); } return 0; } diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h index 99054042dc5..5262c39268a 100644 --- a/fmt-merge-msg.h +++ b/fmt-merge-msg.h @@ -13,7 +13,8 @@ struct fmt_merge_msg_opts { }; extern int merge_log_config; -int fmt_merge_msg_config(const char *key, const char *value, void *cb); +int fmt_merge_msg_config(const char *key, const char *value, + struct key_value_info *kvi, void *cb); int fmt_merge_msg(struct strbuf *in, struct strbuf *out, struct fmt_merge_msg_opts *); diff --git a/fsck.c b/fsck.c index 8ef1b022346..1569e64f011 100644 --- a/fsck.c +++ b/fsck.c @@ -1162,7 +1162,8 @@ struct fsck_gitmodules_data { int ret; }; -static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata) +static int fsck_gitmodules_fn(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *vdata) { struct fsck_gitmodules_data *data = vdata; const char *subsection, *key; @@ -1372,7 +1373,8 @@ int fsck_finish(struct fsck_options *options) return ret; } -int git_fsck_config(const char *var, const char *value, void *cb) +int git_fsck_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { struct fsck_options *options = cb; if (strcmp(var, "fsck.skiplist") == 0) { @@ -1393,7 +1395,7 @@ int git_fsck_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } /* diff --git a/fsck.h b/fsck.h index e17730e9da9..a06f202576c 100644 --- a/fsck.h +++ b/fsck.h @@ -237,6 +237,7 @@ const char *fsck_describe_object(struct fsck_options *options, * git_config() callback for use by fsck-y tools that want to support * fsck. fsck.skipList etc. */ -int git_fsck_config(const char *var, const char *value, void *cb); +int git_fsck_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb); #endif diff --git a/gpg-interface.c b/gpg-interface.c index aceeb083367..5ed89ef69ed 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -12,7 +12,8 @@ #include "alias.h" #include "wrapper.h" -static int git_gpg_config(const char *, const char *, void *); +static int git_gpg_config(const char *, const char *, struct key_value_info *, + void *); static void gpg_interface_lazy_init(void) { @@ -718,7 +719,8 @@ void set_signing_key(const char *key) configured_signing_key = xstrdup(key); } -static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) +static int git_gpg_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { struct gpg_format *fmt = NULL; char *fmtname = NULL; diff --git a/grep.c b/grep.c index b86462a12a9..1516b0689d0 100644 --- a/grep.c +++ b/grep.c @@ -54,7 +54,8 @@ define_list_config_array_extra(color_grep_slots, {"match"}); * Read the configuration file once and store it in * the grep_defaults template. */ -int grep_config(const char *var, const char *value, void *cb) +int grep_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { struct grep_opt *opt = cb; const char *slot; diff --git a/help.c b/help.c index 5d7637dce92..43d1eb702cd 100644 --- a/help.c +++ b/help.c @@ -309,7 +309,8 @@ void load_command_list(const char *prefix, exclude_cmds(other_cmds, main_cmds); } -static int get_colopts(const char *var, const char *value, void *data) +static int get_colopts(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { unsigned int *colopts = data; @@ -459,7 +460,8 @@ void list_developer_interfaces_help(void) putchar('\n'); } -static int get_alias(const char *var, const char *value, void *data) +static int get_alias(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct string_list *list = data; @@ -543,6 +545,7 @@ static struct cmdnames aliases; #define AUTOCORRECT_IMMEDIATELY (-1) static int git_unknown_cmd_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { const char *p; diff --git a/ident.c b/ident.c index 8fad92d7007..21b7b3ff35b 100644 --- a/ident.c +++ b/ident.c @@ -671,7 +671,8 @@ static int set_ident(const char *var, const char *value) return 0; } -int git_ident_config(const char *var, const char *value, void *data UNUSED) +int git_ident_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data UNUSED) { if (!strcmp(var, "user.useconfigonly")) { ident_use_config_only = git_config_bool(var, value); diff --git a/ident.h b/ident.h index 96a64896a01..f55db41ff99 100644 --- a/ident.h +++ b/ident.h @@ -62,6 +62,7 @@ const char *fmt_name(enum want_ident); int committer_ident_sufficiently_given(void); int author_ident_sufficiently_given(void); -int git_ident_config(const char *, const char *, void *); +int git_ident_config(const char *, const char *, + struct key_value_info *UNUSED, void *); #endif diff --git a/imap-send.c b/imap-send.c index a62424e90a4..3cc98f1a0a5 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1322,7 +1322,8 @@ static int split_msg(struct strbuf *all_msgs, struct strbuf *msg, int *ofs) return 1; } -static int git_imap_config(const char *var, const char *val, void *cb) +static int git_imap_config(const char *var, const char *val, + struct key_value_info *kvi, void *cb) { if (!strcmp("imap.sslverify", var)) @@ -1356,7 +1357,7 @@ static int git_imap_config(const char *var, const char *val, void *cb) server.host = xstrdup(val); } } else - return git_default_config(var, val, cb); + return git_default_config(var, val,kvi, cb); return 0; } diff --git a/ll-merge.c b/ll-merge.c index 8be38d3bd41..2d240609ddf 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -252,6 +252,7 @@ static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail; static const char *default_ll_merge; static int read_merge_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { struct ll_merge_driver *fn; diff --git a/ls-refs.c b/ls-refs.c index b9f3e08ec3d..90b902c84f8 100644 --- a/ls-refs.c +++ b/ls-refs.c @@ -136,7 +136,7 @@ static void send_possibly_unborn_head(struct ls_refs_data *data) } static int ls_refs_config(const char *var, const char *value, - void *cb_data) + struct key_value_info *kvi UNUSED, void *cb_data) { struct ls_refs_data *data = cb_data; /* diff --git a/mailinfo.c b/mailinfo.c index 2aeb20e5e62..e2f469c96f7 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -1241,12 +1241,13 @@ int mailinfo_parse_quoted_cr_action(const char *actionstr, int *action) return 0; } -static int git_mailinfo_config(const char *var, const char *value, void *mi_) +static int git_mailinfo_config(const char *var, const char *value, + struct key_value_info *kvi, void *mi_) { struct mailinfo *mi = mi_; if (!starts_with(var, "mailinfo.")) - return git_default_config(var, value, NULL); + return git_default_config(var, value,kvi, NULL); if (!strcmp(var, "mailinfo.scissors")) { mi->use_scissors = git_config_bool(var, value); return 0; diff --git a/notes-utils.c b/notes-utils.c index cb88171b7bb..f7a0ec60731 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -93,7 +93,8 @@ static combine_notes_fn parse_combine_notes_fn(const char *v) return NULL; } -static int notes_rewrite_config(const char *k, const char *v, void *cb) +static int notes_rewrite_config(const char *k, const char *v, + struct key_value_info *kvi UNUSED, void *cb) { struct notes_rewrite_cfg *c = cb; if (starts_with(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) { diff --git a/notes.c b/notes.c index 45fb7f22d1d..89b84ea0869 100644 --- a/notes.c +++ b/notes.c @@ -973,7 +973,8 @@ 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) +static int notes_display_config(const char *k, const char *v, + struct key_value_info *kvi UNUSED, void *cb) { int *load_refs = cb; diff --git a/pager.c b/pager.c index b66bbff2785..4b77e0d2e57 100644 --- a/pager.c +++ b/pager.c @@ -39,6 +39,7 @@ static void wait_for_pager_signal(int signo) } static int core_pager_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data UNUSED) { if (!strcmp(var, "core.pager")) @@ -224,7 +225,9 @@ struct pager_command_config_data { char *value; }; -static int pager_command_config(const char *var, const char *value, void *vdata) +static int pager_command_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *vdata) { struct pager_command_config_data *data = vdata; const char *cmd; diff --git a/pretty.c b/pretty.c index 76fc4f61e40..7f57379c44e 100644 --- a/pretty.c +++ b/pretty.c @@ -55,6 +55,7 @@ static void save_user_format(struct rev_info *rev, const char *cp, int is_tforma } static int git_pretty_formats_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { struct cmt_fmt_map *commit_format = NULL; diff --git a/promisor-remote.c b/promisor-remote.c index a8dbb788e8f..ea68df91209 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -99,7 +99,9 @@ static void promisor_remote_move_to_tail(struct promisor_remote_config *config, config->promisors_tail = &r->next; } -static int promisor_remote_config(const char *var, const char *value, void *data) +static int promisor_remote_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *data) { struct promisor_remote_config *config = data; const char *name; diff --git a/remote.c b/remote.c index 3a831cb5304..10868a963f2 100644 --- a/remote.c +++ b/remote.c @@ -348,7 +348,8 @@ static void read_branches_file(struct remote_state *remote_state, remote->fetch_tags = 1; /* always auto-follow */ } -static int handle_config(const char *key, const char *value, void *cb) +static int handle_config(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { const char *name; size_t namelen; diff --git a/revision.c b/revision.c index 106ca1ce6c9..6de0132d719 100644 --- a/revision.c +++ b/revision.c @@ -1569,7 +1569,8 @@ struct exclude_hidden_refs_cb { const char *section; }; -static int hide_refs_config(const char *var, const char *value, void *cb_data) +static int hide_refs_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb_data) { struct exclude_hidden_refs_cb *cb = cb_data; cb->exclusions->hidden_refs_configured = 1; diff --git a/scalar.c b/scalar.c index de07c37d210..1c44df2ec7a 100644 --- a/scalar.c +++ b/scalar.c @@ -593,7 +593,8 @@ static int cmd_register(int argc, const char **argv) return register_dir(); } -static int get_scalar_repos(const char *key, const char *value, void *data) +static int get_scalar_repos(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct string_list *list = data; diff --git a/sequencer.c b/sequencer.c index 6985ca526ae..171561c2cdb 100644 --- a/sequencer.c +++ b/sequencer.c @@ -214,7 +214,8 @@ static struct update_ref_record *init_update_ref_record(const char *ref) return rec; } -static int git_sequencer_config(const char *k, const char *v, void *cb) +static int git_sequencer_config(const char *k, const char *v, + struct key_value_info *kvi, void *cb) { struct replay_opts *opts = cb; int status; @@ -269,7 +270,7 @@ static int git_sequencer_config(const char *k, const char *v, void *cb) if (opts->action == REPLAY_REVERT && !strcmp(k, "revert.reference")) opts->commit_use_reference = git_config_bool(k, v); - return git_diff_basic_config(k, v, NULL); + return git_diff_basic_config(k, v,kvi, NULL); } void sequencer_init_config(struct replay_opts *opts) @@ -2876,7 +2877,8 @@ static int git_config_string_dup(char **dest, return 0; } -static int populate_opts_cb(const char *key, const char *value, void *data) +static int populate_opts_cb(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct replay_opts *opts = data; int error_flag = 1; diff --git a/setup.c b/setup.c index 6c5b85e96c1..a461dd15233 100644 --- a/setup.c +++ b/setup.c @@ -514,7 +514,9 @@ no_prevention_needed: startup_info->original_cwd = NULL; } -static int read_worktree_config(const char *var, const char *value, void *vdata) +static int read_worktree_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *vdata) { struct repository_format *data = vdata; @@ -585,7 +587,8 @@ static enum extension_result handle_extension(const char *var, return EXTENSION_UNKNOWN; } -static int check_repo_format(const char *var, const char *value, void *vdata) +static int check_repo_format(const char *var, const char *value, + struct key_value_info *kvi, void *vdata) { struct repository_format *data = vdata; const char *ext; @@ -614,7 +617,7 @@ static int check_repo_format(const char *var, const char *value, void *vdata) } } - return read_worktree_config(var, value, vdata); + return read_worktree_config(var, value,kvi, vdata); } static int check_repository_format_gently(const char *gitdir, struct repository_format *candidate, int *nongit_ok) @@ -1113,7 +1116,8 @@ struct safe_directory_data { int is_safe; }; -static int safe_directory_cb(const char *key, const char *value, void *d) +static int safe_directory_cb(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *d) { struct safe_directory_data *data = d; @@ -1169,7 +1173,8 @@ static int ensure_valid_ownership(const char *gitfile, return data.is_safe; } -static int allowed_bare_repo_cb(const char *key, const char *value, void *d) +static int allowed_bare_repo_cb(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *d) { enum allowed_bare_repo *allowed_bare_repo = d; diff --git a/submodule-config.c b/submodule-config.c index ecf0fcf0074..fb12d8040e8 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -424,7 +424,8 @@ struct parse_config_parameter { * config store (.git/config, etc). Callers are responsible for * checking for overrides in the main config store when appropriate. */ -static int parse_config(const char *var, const char *value, void *data) +static int parse_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct parse_config_parameter *me = data; struct submodule *submodule; @@ -673,7 +674,8 @@ out: } } -static int gitmodules_cb(const char *var, const char *value, void *data) +static int gitmodules_cb(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { struct repository *repo = data; struct parse_config_parameter parameter; @@ -800,7 +802,9 @@ void submodule_free(struct repository *r) submodule_cache_clear(r->submodule_cache); } -static int config_print_callback(const char *var, const char *value, void *cb_data) +static int config_print_callback(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *cb_data) { char *wanted_key = cb_data; @@ -842,7 +846,9 @@ struct fetch_config { int *recurse_submodules; }; -static int gitmodules_fetch_config(const char *var, const char *value, void *cb) +static int gitmodules_fetch_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *cb) { struct fetch_config *config = cb; if (!strcmp(var, "submodule.fetchjobs")) { @@ -870,6 +876,7 @@ void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules) } static int gitmodules_update_clone_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { int *max_jobs = cb; diff --git a/t/helper/test-config.c b/t/helper/test-config.c index ad78fc17683..00cd49e5145 100644 --- a/t/helper/test-config.c +++ b/t/helper/test-config.c @@ -42,7 +42,8 @@ * */ -static int iterate_cb(const char *var, const char *value, void *data UNUSED) +static int iterate_cb(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data UNUSED) { static int nr; @@ -59,7 +60,8 @@ static int iterate_cb(const char *var, const char *value, void *data UNUSED) return 0; } -static int parse_int_cb(const char *var, const char *value, void *data) +static int parse_int_cb(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *data) { const char *key_to_match = data; @@ -70,7 +72,8 @@ static int parse_int_cb(const char *var, const char *value, void *data) return 0; } -static int early_config_cb(const char *var, const char *value, void *vdata) +static int early_config_cb(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *vdata) { const char *key = vdata; diff --git a/t/helper/test-userdiff.c b/t/helper/test-userdiff.c index 680124a6760..33dd3a65241 100644 --- a/t/helper/test-userdiff.c +++ b/t/helper/test-userdiff.c @@ -12,7 +12,9 @@ static int driver_cb(struct userdiff_driver *driver, return 0; } -static int cmd__userdiff_config(const char *var, const char *value, void *cb UNUSED) +static int cmd__userdiff_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *cb UNUSED) { if (userdiff_config(var, value) < 0) return -1; diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c index 78cfc15d52d..6871258d468 100644 --- a/trace2/tr2_cfg.c +++ b/trace2/tr2_cfg.c @@ -99,7 +99,8 @@ struct tr2_cfg_data { /* * See if the given config key matches any of our patterns of interest. */ -static int tr2_cfg_cb(const char *key, const char *value, void *d) +static int tr2_cfg_cb(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *d) { struct strbuf **s; struct tr2_cfg_data *data = (struct tr2_cfg_data *)d; diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c index 069786cb927..d17a08b0f50 100644 --- a/trace2/tr2_sysenv.c +++ b/trace2/tr2_sysenv.c @@ -57,7 +57,8 @@ static struct tr2_sysenv_entry tr2_sysenv_settings[] = { }; /* clang-format on */ -static int tr2_sysenv_cb(const char *key, const char *value, void *d) +static int tr2_sysenv_cb(const char *key, const char *value, + struct key_value_info *kvi UNUSED, void *d) { int k; diff --git a/trailer.c b/trailer.c index a2c3ed6f28c..fac7e2cfe6e 100644 --- a/trailer.c +++ b/trailer.c @@ -482,6 +482,7 @@ static struct { }; static int git_trailer_default_config(const char *conf_key, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { const char *trailer_item, *variable_name; @@ -514,6 +515,7 @@ static int git_trailer_default_config(const char *conf_key, const char *value, } static int git_trailer_config(const char *conf_key, const char *value, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { const char *trailer_item, *variable_name; diff --git a/upload-pack.c b/upload-pack.c index e23f16dfdd2..5f8232ff078 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1298,7 +1298,9 @@ static int parse_object_filter_config(const char *var, const char *value, return 0; } -static int upload_pack_config(const char *var, const char *value, void *cb_data) +static int upload_pack_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *cb_data) { struct upload_pack_data *data = cb_data; @@ -1339,7 +1341,9 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data) return parse_hide_refs_config(var, value, "uploadpack", &data->hidden_refs); } -static int upload_pack_protected_config(const char *var, const char *value, void *cb_data) +static int upload_pack_protected_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, + void *cb_data) { struct upload_pack_data *data = cb_data; diff --git a/urlmatch.c b/urlmatch.c index eba0bdd77fe..47683974d8c 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -551,7 +551,8 @@ static int cmp_matches(const struct urlmatch_item *a, return 0; } -int urlmatch_config_entry(const char *var, const char *value, void *cb) +int urlmatch_config_entry(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { struct string_list_item *item; struct urlmatch_config *collect = cb; diff --git a/urlmatch.h b/urlmatch.h index bee374a642c..f6eac4af9ea 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -71,7 +71,8 @@ struct urlmatch_config { .vars = STRING_LIST_INIT_DUP, \ } -int urlmatch_config_entry(const char *var, const char *value, void *cb); +int urlmatch_config_entry(const char *var, const char *value, + struct key_value_info *kvi, void *cb); void urlmatch_config_release(struct urlmatch_config *config); #endif /* URL_MATCH_H */ diff --git a/xdiff-interface.c b/xdiff-interface.c index 0460e03f5ed..f1aac104285 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -307,7 +307,8 @@ int xdiff_compare_lines(const char *l1, long s1, int git_xmerge_style = -1; -int git_xmerge_config(const char *var, const char *value, void *cb) +int git_xmerge_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "merge.conflictstyle")) { if (!value) @@ -327,5 +328,5 @@ int git_xmerge_config(const char *var, const char *value, void *cb) value, var); return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value,kvi, cb); } diff --git a/xdiff-interface.h b/xdiff-interface.h index 3750794afe9..c1676b11702 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -50,7 +50,8 @@ int buffer_is_binary(const char *ptr, unsigned long size); void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); void xdiff_clear_find_func(xdemitconf_t *xecfg); -int git_xmerge_config(const char *var, const char *value, void *cb); +int git_xmerge_config(const char *var, const char *value, + struct key_value_info *kvi, void *cb); extern int git_xmerge_style; /* From patchwork Tue May 30 18:42:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A0D8C7EE2F for ; Tue, 30 May 2023 18:42:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233441AbjE3Smj (ORCPT ); Tue, 30 May 2023 14:42:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232724AbjE3Sm2 (ORCPT ); Tue, 30 May 2023 14:42:28 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AC2E106 for ; Tue, 30 May 2023 11:42:23 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f6ef9a928fso32037445e9.3 for ; Tue, 30 May 2023 11:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472141; x=1688064141; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=1RmdQ+huunD5hfrFf7TDRqB6p/W9L6glVZFLf5uzLhI=; b=Gjob0KR7GpLZyrhgi0QyMOweCFSob8XBwt+YTAcuNsfWFetrG3XByCCMFdCKaIfDeS WujkrZ0uVF39lcaxIAxon6QXB54+FB4r30UsiVlcThWmOEs6KorrItcVYKrkL+bNJNE/ zNADjR3umDuIBuNAI8ZTj563NR5+7TE+hYhxPLPFHBTmtWQaCaVVD5dbCBR59m81/Zvl qCAIyixcsxILQkQ8YCUmw8xzgK5g/+4IEBu5LUkYsgGYFi9/0vMNWg/rpy35ZKkNv2us IG/Ij2wGJrMzPy8zxz1MNSFiWq3HmckT3Pyz/SSwgeA/6eERi9PsQO6vKoC3PN5lk3fH j+vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472141; x=1688064141; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1RmdQ+huunD5hfrFf7TDRqB6p/W9L6glVZFLf5uzLhI=; b=DMG0clTC6lpY13ev8q4YhsJSpEOIo+snsh7g1Hm2IEthwr+cTTOvm0yKpQ6Lz8wSgn vZ2dBbcHByjipfpRP50pLgpeg23t55qgw1IYFiSOTkdsGv1gQsr/km6FuMBLR1yNKbtI 0mDFF/9khJknI8D9DUX/MfipuSpZ6ahFoLDuTzYbhSrkIlCwBfqwcjQFTAu7dfW0pvK8 cWe+GLFU3r12g68jsDEB0SrLWhb62YGPG4aUbZWJEYaY875DtZ/NKLjNX0hpANWcXcIb 9caQkqXVGr51hWHtKDnc77qO7BYKRAMn17kvtcifRG43atYoA8h5zhOsdNC5qH7d6/qX M5Rg== X-Gm-Message-State: AC+VfDwSAeO9zvKW5WuSHMBgiYMN5h/hzfEgqWE9ILDt9Jp9LEiZAC/L UXJ7kw9c8Sn6ULNksksSlLD9mZpUO6c= X-Google-Smtp-Source: ACHHUZ4PfWvDXWSXDLN+EG41A1PQSpQjy67I0nN3Cupqp5TD52DD+Ub0LVmOLn6uWdjbCxR5Y+U51g== X-Received: by 2002:a1c:c902:0:b0:3f6:787:4a70 with SMTP id f2-20020a1cc902000000b003f607874a70mr2191431wmb.15.1685472141511; Tue, 30 May 2023 11:42:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 10-20020a05600c228a00b003f42461ac75sm21650168wmf.12.2023.05.30.11.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:21 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 30 May 2023 18:42:03 +0000 Subject: [PATCH v2 05/14] (RFC-only) config: finish config_fn_t refactor Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Here's an exhaustive list of all of the changes: * Cases that need a judgement call - trace2/tr2_cfg.c:tr2_cfg_set_fl() This function needs to account for tr2_cfg_cb() now using "kvi". Since this is only called (indirectly) by git_config_set(), config source information has never been available here, so just pass NULL. It will be tr2_cfg_cb()'s responsibility to not use "kvi". - builtin/checkout.c:checkout_main() This calls git_xmerge_config() as a shorthand for parsing a CLI arg. "kvi" doesn't apply, so just pass NULL. This might be worth refactoring away, since git_xmerge_config() can call git_default_config(). * Hard for cocci to catch - urlmatch.c Manually refactor the custom config callbacks in "struct urlmatch_config". - diff.h, fsck.h, grep.h, ident.h, xdiff-interface.h "struct key_value_info" hasn't been defined yet, so forward declare it. Alternatively, maybe these files should "#include config.h". * Likely deficiencies in .cocci patch - submodule-config.c:gitmodules_cb() Manually refactor a parse_config() call that gets missed because it uses a different "*data" arg. - grep.h, various Manually refactor grep_config() calls. Not sure why these don't get picked up. - config.c:git_config_include(), http.c:http_options() Manually add "kvi" where it was missed. Not sure why they get missed. - builtin/clone.c:write_one_config() Manually refactor a git_clone_config() call. Probably got missed because I didn't include git_config_parse_parameter(). - ident.h Remove the UNUSED attribute. Not sure why this is the only instance of this. - git-compat-util.h, compat/mingw.[h|c] Manually refactor noop_core_config(), platform_core_config() and mingw_core_config(). I can probably add these as "manual fixups" in cocci. Signed-off-by: Glen Choo --- builtin/checkout.c | 2 +- builtin/clone.c | 4 ++-- builtin/grep.c | 2 +- compat/mingw.c | 3 ++- compat/mingw.h | 4 +++- diff.h | 1 + fsck.h | 1 + git-compat-util.h | 2 ++ grep.c | 6 +++--- grep.h | 4 +++- http.c | 5 +++-- ident.h | 3 ++- submodule-config.c | 4 ++-- trace2/tr2_cfg.c | 2 +- urlmatch.c | 6 +++--- xdiff-interface.h | 2 ++ 16 files changed, 32 insertions(+), 19 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 92017ba6696..9641423dc2f 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1687,7 +1687,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix, if (opts->conflict_style) { opts->merge = 1; /* implied */ - git_xmerge_config("merge.conflictstyle", opts->conflict_style, NULL); + git_xmerge_config("merge.conflictstyle", opts->conflict_style, NULL, NULL); } if (opts->force) { opts->discard_changes = 1; diff --git a/builtin/clone.c b/builtin/clone.c index 1e1cf104194..e654757c45d 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -791,14 +791,14 @@ static int git_clone_config(const char *k, const char *v, } static int write_one_config(const char *key, const char *value, - struct key_value_info *kvi UNUSED, void *data) + struct key_value_info *kvi, void *data) { /* * give git_clone_config a chance to write config values back to the * environment, since git_config_set_multivar_gently only deals with * config-file writes */ - int apply_failed = git_clone_config(key, value, data); + int apply_failed = git_clone_config(key, value, kvi, data); if (apply_failed) return apply_failed; diff --git a/builtin/grep.c b/builtin/grep.c index 177befc3ed4..6e795f9f3a2 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -290,7 +290,7 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, struct key_value_info *kvi, void *cb) { - int st = grep_config(var, value, cb); + int st = grep_config(var, value, kvi, cb); if (git_color_config(var, value, cb) < 0) st = -1; diff --git a/compat/mingw.c b/compat/mingw.c index 94c5a1daa40..c8181469a2f 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -242,7 +242,8 @@ static int core_restrict_inherited_handles = -1; static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY; static char *unset_environment_variables; -int mingw_core_config(const char *var, const char *value, void *cb) +int mingw_core_config(const char *var, const char *value, + struct key_value_info *kvi UNUSED, void *cb) { if (!strcmp(var, "core.hidedotfiles")) { if (value && !strcasecmp(value, "dotgitonly")) diff --git a/compat/mingw.h b/compat/mingw.h index 209cf7cebad..4f2b489b883 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -11,7 +11,9 @@ typedef _sigset_t sigset_t; #undef _POSIX_THREAD_SAFE_FUNCTIONS #endif -int mingw_core_config(const char *var, const char *value, void *cb); +struct key_value_info; +int mingw_core_config(const char *var, const char *value, + struct key_value_info *, void *cb); #define platform_core_config mingw_core_config /* diff --git a/diff.h b/diff.h index 6a3efa63753..2ceb0fd2d66 100644 --- a/diff.h +++ b/diff.h @@ -532,6 +532,7 @@ void free_diffstat_info(struct diffstat_t *diffstat); int parse_long_opt(const char *opt, const char **argv, const char **optarg); +struct key_value_info; int git_diff_basic_config(const char *var, const char *value, struct key_value_info *kvi, void *cb); int git_diff_heuristic_config(const char *var, const char *value, void *cb); diff --git a/fsck.h b/fsck.h index a06f202576c..914e67a067d 100644 --- a/fsck.h +++ b/fsck.h @@ -233,6 +233,7 @@ void fsck_put_object_name(struct fsck_options *options, const char *fsck_describe_object(struct fsck_options *options, const struct object_id *oid); +struct key_value_info; /* * git_config() callback for use by fsck-y tools that want to support * fsck. fsck.skipList etc. diff --git a/git-compat-util.h b/git-compat-util.h index 4a200a9fb41..6812b592c15 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -440,8 +440,10 @@ typedef uintmax_t timestamp_t; #endif #ifndef platform_core_config +struct key_value_info; static inline int noop_core_config(const char *var UNUSED, const char *value UNUSED, + struct key_value_info *kvi UNUSED, void *cb UNUSED) { return 0; diff --git a/grep.c b/grep.c index 1516b0689d0..2d3b9bf5d92 100644 --- a/grep.c +++ b/grep.c @@ -55,7 +55,7 @@ define_list_config_array_extra(color_grep_slots, {"match"}); * the grep_defaults template. */ int grep_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { struct grep_opt *opt = cb; const char *slot; @@ -90,9 +90,9 @@ int grep_config(const char *var, const char *value, if (!strcmp(var, "color.grep")) opt->color = git_config_colorbool(var, value); if (!strcmp(var, "color.grep.match")) { - if (grep_config("color.grep.matchcontext", value, cb) < 0) + if (grep_config("color.grep.matchcontext", value, kvi, cb) < 0) return -1; - if (grep_config("color.grep.matchselected", value, cb) < 0) + if (grep_config("color.grep.matchselected", value, kvi, cb) < 0) return -1; } else if (skip_prefix(var, "color.grep.", &slot)) { int i = LOOKUP_CONFIG(color_grep_slots, slot); diff --git a/grep.h b/grep.h index c59592e3bdb..6d2fb0ada54 100644 --- a/grep.h +++ b/grep.h @@ -202,7 +202,9 @@ struct grep_opt { .output = std_output, \ } -int grep_config(const char *var, const char *value, void *); +struct key_value_info; +int grep_config(const char *var, const char *value, struct key_value_info *kvi, + void *); void grep_init(struct grep_opt *, struct repository *repo); void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t); diff --git a/http.c b/http.c index d5d82c5230f..3d4292eba6a 100644 --- a/http.c +++ b/http.c @@ -361,7 +361,8 @@ static void process_curl_messages(void) } } -static int http_options(const char *var, const char *value, void *cb) +static int http_options(const char *var, const char *value, + struct key_value_info *kvi, void *cb) { if (!strcmp("http.version", var)) { return git_config_string(&curl_http_version, var, value); @@ -532,7 +533,7 @@ static int http_options(const char *var, const char *value, void *cb) } /* Fall back on the default ones */ - return git_default_config(var, value, cb); + return git_default_config(var, value, kvi, cb); } static int curl_empty_auth_enabled(void) diff --git a/ident.h b/ident.h index f55db41ff99..4e3bd347c52 100644 --- a/ident.h +++ b/ident.h @@ -62,7 +62,8 @@ const char *fmt_name(enum want_ident); int committer_ident_sufficiently_given(void); int author_ident_sufficiently_given(void); +struct key_value_info; int git_ident_config(const char *, const char *, - struct key_value_info *UNUSED, void *); + struct key_value_info *, void *); #endif diff --git a/submodule-config.c b/submodule-config.c index fb12d8040e8..0b794b6f32e 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -675,7 +675,7 @@ out: } static int gitmodules_cb(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *data) + struct key_value_info *kvi, void *data) { struct repository *repo = data; struct parse_config_parameter parameter; @@ -685,7 +685,7 @@ static int gitmodules_cb(const char *var, const char *value, parameter.gitmodules_oid = null_oid(); parameter.overwrite = 1; - return parse_config(var, value, ¶meter); + return parse_config(var, value, kvi, ¶meter); } void repo_read_gitmodules(struct repository *repo, int skip_if_read) diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c index 6871258d468..8ed139c69f4 100644 --- a/trace2/tr2_cfg.c +++ b/trace2/tr2_cfg.c @@ -146,5 +146,5 @@ void tr2_cfg_set_fl(const char *file, int line, const char *key, struct tr2_cfg_data data = { file, line }; if (tr2_cfg_load_patterns() > 0) - tr2_cfg_cb(key, value, &data); + tr2_cfg_cb(key, value, NULL, &data); } diff --git a/urlmatch.c b/urlmatch.c index 47683974d8c..c94500b61b3 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -552,7 +552,7 @@ static int cmp_matches(const struct urlmatch_item *a, } int urlmatch_config_entry(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { struct string_list_item *item; struct urlmatch_config *collect = cb; @@ -566,7 +566,7 @@ int urlmatch_config_entry(const char *var, const char *value, if (!skip_prefix(var, collect->section, &key) || *(key++) != '.') { if (collect->cascade_fn) - return collect->cascade_fn(var, value, cb); + return collect->cascade_fn(var, value, kvi, cb); return 0; /* not interested */ } dot = strrchr(key, '.'); @@ -610,7 +610,7 @@ int urlmatch_config_entry(const char *var, const char *value, strbuf_addstr(&synthkey, collect->section); strbuf_addch(&synthkey, '.'); strbuf_addstr(&synthkey, key); - retval = collect->collect_fn(synthkey.buf, value, collect->cb); + retval = collect->collect_fn(synthkey.buf, value, kvi, collect->cb); strbuf_release(&synthkey); return retval; diff --git a/xdiff-interface.h b/xdiff-interface.h index c1676b11702..749cdf77579 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -50,6 +50,8 @@ int buffer_is_binary(const char *ptr, unsigned long size); void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); void xdiff_clear_find_func(xdemitconf_t *xecfg); + +struct key_value_info; int git_xmerge_config(const char *var, const char *value, struct key_value_info *kvi, void *cb); extern int git_xmerge_style; From patchwork Tue May 30 18:42:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260968 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40367C77B7A for ; Tue, 30 May 2023 18:42:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231346AbjE3Smh (ORCPT ); Tue, 30 May 2023 14:42:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbjE3Sm1 (ORCPT ); Tue, 30 May 2023 14:42:27 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AE0110A for ; Tue, 30 May 2023 11:42:23 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f6a6b9c079so34716435e9.1 for ; Tue, 30 May 2023 11:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472142; x=1688064142; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=NwdY4aGS3GND8VMsPLCB1Mh7TgltBjBVwlNjPvA0zh0=; b=LYGwXZs9UsV4re960KS0HXDmAptaLLllBYUPkDcT9Gp21tckLBUMJhQ7RQjWdsV14c Ll3o6Wcs1NtIxlcAvw8Dux90socsJmIEst+OiJdPrtCVyL2kXmfq7aTmcOKv2qGmTYur Lfkv/OU9oatgwv2GYoQsJDC2U6vp0GI2+Lq7op0HNK1hHKDM/Pjn0kjI7sfcKK7HLoSr 4hhTarNIoDuFNb/danNEKyNY6mP6Z605jp470ICk/i8TozZjdwz2QvDeUhXKNBnQTyHA z47eBMV3D/PSbDKeV70mxM3/9X4RVGAPEtGe3DDQu2zQ1O4xxF7bsXBOGbbt4mSme0Th JOuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472142; x=1688064142; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NwdY4aGS3GND8VMsPLCB1Mh7TgltBjBVwlNjPvA0zh0=; b=a6TA6yblhqQ6W4RSSc+0yHTCLsDGaO3NXnt+qdXv5xq1siCIPzCbvDr2yi7js4lIPo /nPPBHihCwoB3Zoa/bbtp7O+lz07utA7obo0QwCVDjJIPH1psSkxFM3nkDnI4oCvPZN9 Evd2b8dWT0WvxxuWhxss+SC8GtRvS862/9LEMYPlAGR2iEX5AeeO1J4lZfqo00vuX/BI svpSsMSxoWc26hec0DqTqF7J3Kkj95IzWB3S5ydQdvOfA81DaObBKlh6Zvbny5u6Xv/N CTamNbgq2kcMGrvjyp9UvGj1TFIEmzUTfa1gOLo52ZWikB+H9g3Lki0uZro+rLM0Czy1 1itQ== X-Gm-Message-State: AC+VfDxFXo7YRkr5kZMh8aZ4eK0nXGOGk66Dh9QhJOxAelivmFs5MWB7 9dPHmiQWe0fl50dvW8mGcWwvPxZXugE= X-Google-Smtp-Source: ACHHUZ4dUgYRoHvJTMRqmaDZCXfKSwkxZfKvi6/efiOJ1f9E6uIz5ueHCPJ9k8Zj6Aibuaj+ROxH4w== X-Received: by 2002:a1c:f60b:0:b0:3f6:8ea:3830 with SMTP id w11-20020a1cf60b000000b003f608ea3830mr2142361wmc.5.1685472141943; Tue, 30 May 2023 11:42:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o11-20020a05600c378b00b003f195d540d9sm21828550wmr.14.2023.05.30.11.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:21 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 30 May 2023 18:42:04 +0000 Subject: [PATCH v2 06/14] config.c: pass kvi in configsets Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Trivially pass "struct key_value_info" to config callbacks in configset_iter(). Then, in config callbacks that are only used with configsets, use the "kvi" arg to replace calls to current_config_*(), and delete current_config_line() because it has no remaining callers. This leaves builtin/config.c and config.c as the only remaining users of current_config_*(). Signed-off-by: Glen Choo --- builtin/remote.c | 8 ++++---- config.c | 34 +++++++++++++++------------------- config.h | 2 +- remote.c | 6 +++--- t/helper/test-config.c | 10 +++++----- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index edb4a9ddd7f..0a18c49f1f8 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -646,17 +646,17 @@ struct push_default_info }; static int config_read_push_default(const char *key, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { struct push_default_info* info = cb; if (strcmp(key, "remote.pushdefault") || !value || strcmp(value, info->old_name)) return 0; - info->scope = current_config_scope(); + info->scope = kvi->scope; strbuf_reset(&info->origin); - strbuf_addstr(&info->origin, current_config_name()); - info->linenr = current_config_line(); + strbuf_addstr(&info->origin, config_origin_type_name(kvi->origin_type)); + info->linenr = kvi->linenr; return 0; } diff --git a/config.c b/config.c index 1bc2e35a3e0..66078b22eef 100644 --- a/config.c +++ b/config.c @@ -2301,19 +2301,18 @@ static void configset_iter(struct config_reader *reader, struct config_set *set, struct string_list *values; struct config_set_element *entry; struct configset_list *list = &set->list; + struct key_value_info *kvi; for (i = 0; i < list->nr; i++) { entry = list->items[i].e; value_index = list->items[i].value_index; values = &entry->value_list; + kvi = values->items[value_index].util; config_reader_set_kvi(reader, values->items[value_index].util); - if (fn(entry->key, values->items[value_index].string, NULL, data) < 0) - git_die_config_linenr(entry->key, - reader->config_kvi->filename, - reader->config_kvi->linenr); - + if (fn(entry->key, values->items[value_index].string, kvi, data) < 0) + git_die_config_linenr(entry->key, kvi->filename, kvi->linenr); config_reader_set_kvi(reader, NULL); } } @@ -3951,13 +3950,8 @@ static int reader_origin_type(struct config_reader *reader, return 0; } -const char *current_config_origin_type(void) +const char *config_origin_type_name(enum config_origin_type type) { - enum config_origin_type type = CONFIG_ORIGIN_UNKNOWN; - - if (reader_origin_type(&the_reader, &type)) - BUG("current_config_origin_type called outside config callback"); - switch (type) { case CONFIG_ORIGIN_BLOB: return "blob"; @@ -3974,6 +3968,16 @@ const char *current_config_origin_type(void) } } +const char *current_config_origin_type(void) +{ + enum config_origin_type type = CONFIG_ORIGIN_UNKNOWN; + + if (reader_origin_type(&the_reader, &type)) + BUG("current_config_origin_type called outside config callback"); + + return config_origin_type_name(type); +} + const char *config_scope_name(enum config_scope scope) { switch (scope) { @@ -4021,14 +4025,6 @@ enum config_scope current_config_scope(void) return the_reader.parsing_scope; } -int current_config_line(void) -{ - if (the_reader.config_kvi) - return the_reader.config_kvi->linenr; - else - return the_reader.source->linenr; -} - int lookup_config(const char **mapping, int nr_mapping, const char *var) { int i; diff --git a/config.h b/config.h index 9e0c1f12165..ea4ffe37a55 100644 --- a/config.h +++ b/config.h @@ -367,7 +367,7 @@ int git_config_parse_parameter(const char *, config_fn_t fn, void *data); enum config_scope current_config_scope(void); const char *current_config_origin_type(void); const char *current_config_name(void); -int current_config_line(void); +const char *config_origin_type_name(enum config_origin_type type); /* * Match and parse a config key of the form: diff --git a/remote.c b/remote.c index 10868a963f2..266601157e3 100644 --- a/remote.c +++ b/remote.c @@ -349,7 +349,7 @@ static void read_branches_file(struct remote_state *remote_state, } static int handle_config(const char *key, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { const char *name; size_t namelen; @@ -414,8 +414,8 @@ static int handle_config(const char *key, const char *value, } remote = make_remote(remote_state, name, namelen); remote->origin = REMOTE_CONFIG; - if (current_config_scope() == CONFIG_SCOPE_LOCAL || - current_config_scope() == CONFIG_SCOPE_WORKTREE) + if (kvi->scope == CONFIG_SCOPE_LOCAL || + kvi->scope == CONFIG_SCOPE_WORKTREE) remote->configured_in_repo = 1; if (!strcmp(subkey, "mirror")) remote->mirror = git_config_bool(key, value); diff --git a/t/helper/test-config.c b/t/helper/test-config.c index 00cd49e5145..7027ffa187f 100644 --- a/t/helper/test-config.c +++ b/t/helper/test-config.c @@ -43,7 +43,7 @@ */ static int iterate_cb(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *data UNUSED) + struct key_value_info *kvi, void *data UNUSED) { static int nr; @@ -52,10 +52,10 @@ static int iterate_cb(const char *var, const char *value, printf("key=%s\n", var); printf("value=%s\n", value ? value : "(null)"); - printf("origin=%s\n", current_config_origin_type()); - printf("name=%s\n", current_config_name()); - printf("lno=%d\n", current_config_line()); - printf("scope=%s\n", config_scope_name(current_config_scope())); + printf("origin=%s\n", config_origin_type_name(kvi->origin_type)); + printf("name=%s\n", kvi->filename ? kvi->filename : ""); + printf("lno=%d\n", kvi->linenr); + printf("scope=%s\n", config_scope_name(kvi->scope)); return 0; } From patchwork Tue May 30 18:42:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260971 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDCC4C77B73 for ; Tue, 30 May 2023 18:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232735AbjE3Sm4 (ORCPT ); Tue, 30 May 2023 14:42:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233367AbjE3Sm3 (ORCPT ); Tue, 30 May 2023 14:42:29 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E50211C for ; Tue, 30 May 2023 11:42:24 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f68fc6b479so49970315e9.2 for ; Tue, 30 May 2023 11:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472143; x=1688064143; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eYmvlIrHXeZx1iTntJCUZzQZswZVbyJQNf5/cjIOkdQ=; b=EvnuXOZ1rDx1ma0V6kP6sxDPgR+EaVlGBFjtxjhyx1+baR6/OrgNa3wQ3+wQLNczsg DLb30jylHn0goFKB9cNCyM5Ui+vhAFvnCAcOENgh7yQEYoGdNaijCc2zXCrewj0IV19C MldTp9A6jl24QUaVm0reCDEXma90KmpHSA5xjGx7Y2Xx5iRdXEpE8nFe9scLWplGqjSG HFhf92Hu+0NwVJzFWED6tv8r/tHjMq7DinjMATa7dg6SytD/MY44mmtHvvCbh8su5D6P YBuEN8rdVKu73wl8+UdxGTbSvUq3ZEIAr0y1hRdjZopQhwoRJ+hp8+Ms8YYLTxISuOXA oySg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472143; x=1688064143; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eYmvlIrHXeZx1iTntJCUZzQZswZVbyJQNf5/cjIOkdQ=; b=COjOiCOLA9Hhx2dl7fd2tFDJGZ8ElHcZvICrw6kPc/9oFEF/05fHzNo1Y6a/4UxcCZ 2vXLN1GyyqFZbNM/QFRUnBhGA9CxsCsYKuN9VfKMp0fyey1fCWAkSmtgEsnei/0XIaVY RXeWfPUaQk4KfMaJl0XtvhHTbNO5bxsBhCjt7S9IJ+SYde9ntgQ3CN0fXZgvezIVAqy0 /tYglIEfSIBsaKh4yCArA+awX1bopaxvpje09DE1mIZwxo9eFKbwxcxioygPALSdjsWw CD52apRSkP+pWtBO9cCyYkisqHQcvu0gEcd2IZdZ9GyOUrwEzH6GHEHr91O6IVsK1qBN Ifyw== X-Gm-Message-State: AC+VfDyMLfXspX5VuemQGnKTTMEPjIsWkA7g6l52fjupmy3UIvYQgKzG TBXlPrJ9EQLPJDS7rI9j3oA2gF+tWkg= X-Google-Smtp-Source: ACHHUZ6LEw8iCPG2+M+YC7VQE28jcG2UZ8warfzSyDEJsh7lPC9h8OQDz0+icweB8E+oPpEgXAHqOw== X-Received: by 2002:adf:f104:0:b0:30a:e5ba:170d with SMTP id r4-20020adff104000000b0030ae5ba170dmr2444766wro.32.1685472142752; Tue, 30 May 2023 11:42:22 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id bf3-20020a0560001cc300b00307b5376b2csm4038053wrb.90.2023.05.30.11.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:22 -0700 (PDT) Message-Id: <641a56f0b40a88b0127819989ed1f81f844a090e.1685472133.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:05 +0000 Subject: [PATCH v2 07/14] config: provide kvi with config files Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Refactor out the configset logic that caches "struct config_source" and "enum config_scope" as a "struct key_value_info", and use it to pass the "kvi" arg to config callbacks when parsing config files. Get the "enum config_scope" value by plumbing an additional arg through git_config_from_file_with_options() and the underlying machinery. We do not exercise the "kvi" arg yet because the remaining current_config_*() callers may be used with config_with_options(), which may read config from parameters, but parameters don't pass "kvi" yet. Signed-off-by: Glen Choo --- bundle-uri.c | 1 + config.c | 104 +++++++++++++++++++++++++++++---------------- config.h | 8 ++-- fsck.c | 3 +- submodule-config.c | 5 ++- 5 files changed, 79 insertions(+), 42 deletions(-) diff --git a/bundle-uri.c b/bundle-uri.c index 7f01fbbff74..bb88ccbca4b 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -254,6 +254,7 @@ int bundle_uri_parse_config_format(const char *uri, } result = git_config_from_file_with_options(config_to_bundle_list, filename, list, + CONFIG_SCOPE_UNKNOWN, &opts); if (!result && list->mode == BUNDLE_MODE_NONE) { diff --git a/config.c b/config.c index 66078b22eef..4b6830fcc79 100644 --- a/config.c +++ b/config.c @@ -251,7 +251,9 @@ static int handle_path_include(struct config_source *cs, const char *path, !cs ? "" : cs->name ? cs->name : "the command line"); - ret = git_config_from_file(git_config_include, path, inc); + ret = git_config_from_file_with_options(git_config_include, path, inc, + current_config_scope(), + NULL); inc->depth--; } cleanup: @@ -481,7 +483,7 @@ static int include_condition_is_true(struct config_source *cs, } static int git_config_include(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *data) + struct key_value_info *kvi, void *data) { struct config_include_data *inc = data; struct config_source *cs = inc->config_reader->source; @@ -493,7 +495,7 @@ static int git_config_include(const char *var, const char *value, * Pass along all values, including "include" directives; this makes it * possible to query information on the includes themselves. */ - ret = inc->fn(var, value, NULL, inc->data); + ret = inc->fn(var, value, kvi, inc->data); if (ret < 0) return ret; @@ -929,8 +931,8 @@ static char *parse_value(struct config_source *cs) } } -static int get_value(struct config_source *cs, config_fn_t fn, void *data, - struct strbuf *name) +static int get_value(struct config_source *cs, struct key_value_info *kvi, + config_fn_t fn, void *data, struct strbuf *name) { int c; char *value; @@ -963,7 +965,8 @@ static int get_value(struct config_source *cs, config_fn_t fn, void *data, * accurate line number in error messages. */ cs->linenr--; - ret = fn(name->buf, value, NULL, data); + kvi->linenr = cs->linenr; + ret = fn(name->buf, value, kvi, data); if (ret >= 0) cs->linenr++; return ret; @@ -1062,8 +1065,19 @@ static int do_event(struct config_source *cs, enum config_event_t type, return 0; } +static void kvi_from_source(struct config_source *cs, + enum config_scope scope, + struct key_value_info *out) +{ + out->filename = strintern(cs->name); + out->origin_type = cs->origin_type; + out->linenr = cs->linenr; + out->scope = scope; +} + static int git_parse_source(struct config_source *cs, config_fn_t fn, - void *data, const struct config_options *opts) + struct key_value_info *kvi, void *data, + const struct config_options *opts) { int comment = 0; size_t baselen = 0; @@ -1147,7 +1161,7 @@ static int git_parse_source(struct config_source *cs, config_fn_t fn, */ strbuf_setlen(var, baselen); strbuf_addch(var, tolower(c)); - if (get_value(cs, fn, data, var) < 0) + if (get_value(cs, kvi, fn, data, var) < 0) break; } @@ -2005,9 +2019,11 @@ int git_default_config(const char *var, const char *value, * this function. */ static int do_config_from(struct config_reader *reader, - struct config_source *top, config_fn_t fn, void *data, + struct config_source *top, config_fn_t fn, + void *data, enum config_scope scope, const struct config_options *opts) { + struct key_value_info kvi = { 0 }; int ret; /* push config-file parsing state stack */ @@ -2017,8 +2033,9 @@ static int do_config_from(struct config_reader *reader, strbuf_init(&top->value, 1024); strbuf_init(&top->var, 1024); config_reader_push_source(reader, top); + kvi_from_source(top, scope, &kvi); - ret = git_parse_source(top, fn, data, opts); + ret = git_parse_source(top, fn, &kvi, data, opts); /* pop config-file parsing state stack */ strbuf_release(&top->value); @@ -2032,7 +2049,8 @@ static int do_config_from_file(struct config_reader *reader, config_fn_t fn, const enum config_origin_type origin_type, const char *name, const char *path, FILE *f, - void *data, const struct config_options *opts) + void *data, enum config_scope scope, + const struct config_options *opts) { struct config_source top = CONFIG_SOURCE_INIT; int ret; @@ -2047,19 +2065,20 @@ static int do_config_from_file(struct config_reader *reader, top.do_ftell = config_file_ftell; flockfile(f); - ret = do_config_from(reader, &top, fn, data, opts); + ret = do_config_from(reader, &top, fn, data, scope, opts); funlockfile(f); return ret; } -static int git_config_from_stdin(config_fn_t fn, void *data) +static int git_config_from_stdin(config_fn_t fn, void *data, + enum config_scope scope) { return do_config_from_file(&the_reader, fn, CONFIG_ORIGIN_STDIN, "", - NULL, stdin, data, NULL); + NULL, stdin, data, scope, NULL); } int git_config_from_file_with_options(config_fn_t fn, const char *filename, - void *data, + void *data, enum config_scope scope, const struct config_options *opts) { int ret = -1; @@ -2070,7 +2089,8 @@ int git_config_from_file_with_options(config_fn_t fn, const char *filename, f = fopen_or_warn(filename, "r"); if (f) { ret = do_config_from_file(&the_reader, fn, CONFIG_ORIGIN_FILE, - filename, filename, f, data, opts); + filename, filename, f, data, scope, + opts); fclose(f); } return ret; @@ -2078,13 +2098,15 @@ int git_config_from_file_with_options(config_fn_t fn, const char *filename, int git_config_from_file(config_fn_t fn, const char *filename, void *data) { - return git_config_from_file_with_options(fn, filename, data, NULL); + return git_config_from_file_with_options(fn, filename, data, + CONFIG_SCOPE_UNKNOWN, NULL); } int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_type, const char *name, const char *buf, size_t len, - void *data, const struct config_options *opts) + void *data, enum config_scope scope, + const struct config_options *opts) { struct config_source top = CONFIG_SOURCE_INIT; @@ -2099,14 +2121,15 @@ int git_config_from_mem(config_fn_t fn, top.do_ungetc = config_buf_ungetc; top.do_ftell = config_buf_ftell; - return do_config_from(&the_reader, &top, fn, data, opts); + return do_config_from(&the_reader, &top, fn, data, scope, opts); } int git_config_from_blob_oid(config_fn_t fn, const char *name, struct repository *repo, const struct object_id *oid, - void *data) + void *data, + enum config_scope scope) { enum object_type type; char *buf; @@ -2122,7 +2145,7 @@ int git_config_from_blob_oid(config_fn_t fn, } ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, - data, NULL); + data, scope, NULL); free(buf); return ret; @@ -2131,13 +2154,14 @@ int git_config_from_blob_oid(config_fn_t fn, static int git_config_from_blob_ref(config_fn_t fn, struct repository *repo, const char *name, - void *data) + void *data, + enum config_scope scope) { struct object_id oid; if (repo_get_oid(repo, name, &oid) < 0) return error(_("unable to resolve config blob '%s'"), name); - return git_config_from_blob_oid(fn, name, repo, &oid, data); + return git_config_from_blob_oid(fn, name, repo, &oid, data, scope); } char *git_system_config(void) @@ -2212,27 +2236,34 @@ static int do_git_config_sequence(struct config_reader *reader, if (git_config_system() && system_config && !access_or_die(system_config, R_OK, opts->system_gently ? ACCESS_EACCES_OK : 0)) - ret += git_config_from_file(fn, system_config, data); + ret += git_config_from_file_with_options(fn, system_config, + data, CONFIG_SCOPE_SYSTEM, + NULL); config_reader_set_scope(reader, CONFIG_SCOPE_GLOBAL); git_global_config(&user_config, &xdg_config); if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) - ret += git_config_from_file(fn, xdg_config, data); + ret += git_config_from_file_with_options(fn, xdg_config, data, + CONFIG_SCOPE_GLOBAL, NULL); if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) - ret += git_config_from_file(fn, user_config, data); + ret += git_config_from_file_with_options(fn, user_config, data, + CONFIG_SCOPE_GLOBAL, NULL); config_reader_set_scope(reader, CONFIG_SCOPE_LOCAL); if (!opts->ignore_repo && repo_config && !access_or_die(repo_config, R_OK, 0)) - ret += git_config_from_file(fn, repo_config, data); + ret += git_config_from_file_with_options(fn, repo_config, data, + CONFIG_SCOPE_LOCAL, NULL); config_reader_set_scope(reader, CONFIG_SCOPE_WORKTREE); if (!opts->ignore_worktree && repository_format_worktree_config) { char *path = git_pathdup("config.worktree"); if (!access_or_die(path, R_OK, 0)) - ret += git_config_from_file(fn, path, data); + ret += git_config_from_file_with_options(fn, path, data, + CONFIG_SCOPE_WORKTREE, + NULL); free(path); } @@ -2274,14 +2305,16 @@ int config_with_options(config_fn_t fn, void *data, * regular lookup sequence. */ if (config_source && config_source->use_stdin) { - ret = git_config_from_stdin(fn, data); + ret = git_config_from_stdin(fn, data, config_source->scope); } else if (config_source && config_source->file) { - ret = git_config_from_file(fn, config_source->file, data); + ret = git_config_from_file_with_options(fn, config_source->file, + data, config_source->scope, + NULL); } else if (config_source && config_source->blob) { struct repository *repo = config_source->repo ? config_source->repo : the_repository; ret = git_config_from_blob_ref(fn, repo, config_source->blob, - data); + data, config_source->scope); } else { ret = do_git_config_sequence(&the_reader, opts, fn, data); } @@ -2423,16 +2456,14 @@ static int configset_add_value(struct config_reader *reader, if (!reader->source) BUG("configset_add_value has no source"); if (reader->source->name) { - kv_info->filename = strintern(reader->source->name); - kv_info->linenr = reader->source->linenr; - kv_info->origin_type = reader->source->origin_type; + kvi_from_source(reader->source, current_config_scope(), kv_info); } else { /* for values read from `git_config_from_parameters()` */ kv_info->filename = NULL; kv_info->linenr = -1; kv_info->origin_type = CONFIG_ORIGIN_CMDLINE; + kv_info->scope = reader->parsing_scope; } - kv_info->scope = reader->parsing_scope; si->util = kv_info; return 0; @@ -3472,7 +3503,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, */ if (git_config_from_file_with_options(store_aux, config_filename, - &store, &opts)) { + &store, CONFIG_SCOPE_UNKNOWN, + &opts)) { error(_("invalid config file %s"), config_filename); ret = CONFIG_INVALID_FILE; goto out_free; diff --git a/config.h b/config.h index ea4ffe37a55..ca5aac62980 100644 --- a/config.h +++ b/config.h @@ -150,16 +150,18 @@ int git_default_config(const char *, const char *, struct key_value_info *, int git_config_from_file(config_fn_t fn, const char *, void *); int git_config_from_file_with_options(config_fn_t fn, const char *, - void *, + void *, enum config_scope, const struct config_options *); int git_config_from_mem(config_fn_t fn, const enum config_origin_type, const char *name, const char *buf, size_t len, - void *data, const struct config_options *opts); + void *data, enum config_scope scope, + const struct config_options *opts); int git_config_from_blob_oid(config_fn_t fn, const char *name, struct repository *repo, - const struct object_id *oid, void *data); + const struct object_id *oid, void *data, + enum config_scope scope); void git_config_push_parameter(const char *text); void git_config_push_env(const char *spec); int git_config_from_parameters(config_fn_t fn, void *data); diff --git a/fsck.c b/fsck.c index 1569e64f011..ec26857c79d 100644 --- a/fsck.c +++ b/fsck.c @@ -1236,7 +1236,8 @@ static int fsck_blob(const struct object_id *oid, const char *buf, data.ret = 0; config_opts.error_action = CONFIG_ERROR_SILENT; if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB, - ".gitmodules", buf, size, &data, &config_opts)) + ".gitmodules", buf, size, &data, + CONFIG_SCOPE_UNKNOWN, &config_opts)) data.ret |= report(options, oid, OBJ_BLOB, FSCK_MSG_GITMODULES_PARSE, "could not parse gitmodules blob"); diff --git a/submodule-config.c b/submodule-config.c index 0b794b6f32e..7d773f33621 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -604,7 +604,7 @@ static const struct submodule *config_from(struct submodule_cache *cache, parameter.gitmodules_oid = &oid; parameter.overwrite = 0; git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf, - config, config_size, ¶meter, NULL); + config, config_size, ¶meter, CONFIG_SCOPE_UNKNOWN, NULL); strbuf_release(&rev); free(config); @@ -713,7 +713,8 @@ void gitmodules_config_oid(const struct object_id *commit_oid) if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) { git_config_from_blob_oid(gitmodules_cb, rev.buf, - the_repository, &oid, the_repository); + the_repository, &oid, the_repository, + CONFIG_SCOPE_UNKNOWN); } strbuf_release(&rev); From patchwork Tue May 30 18:42:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260967 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AB8AC77B7A for ; Tue, 30 May 2023 18:42:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233482AbjE3Sme (ORCPT ); Tue, 30 May 2023 14:42:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232890AbjE3Sm0 (ORCPT ); Tue, 30 May 2023 14:42:26 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AFC910D for ; Tue, 30 May 2023 11:42:24 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3090d3e9c92so4789218f8f.2 for ; Tue, 30 May 2023 11:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472143; x=1688064143; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=pIg6+ojWHoHlMlxZS0UeEjxPgzzEe5+2AGTg/jYTUCQ=; b=DOYV5DPNdGhkPjWaMQPmbpiKMZ08mSBbpqxmbf7jSlvBtyq4AaLcuk8j85bmlX8FeN BKhYQdO2wQxOm5INwzp2rsKGhcZ0MLEw8w8k6QdJnrcmZaHUL5VQ1xQ1EoakclkzYvf8 w0LmanbkT8Fu/X4xjqCbydoZ0ZniQtGpFT8URszTZJe0Kd8u+4eyVPes8TFH4f01fN6o 1KW4yCgm+onGS4ZdscvcdgDeEOawIHA/O9MCS+spyPWrFEfTZGwXahhGM/hWmtJYS2Q4 gK3fiB2ltxmjyI1IrlKQjI4H+FXGDsaWG12vU+vA0viBBsnxRho44yDGSFBkfCwGxWsN EfGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472143; x=1688064143; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pIg6+ojWHoHlMlxZS0UeEjxPgzzEe5+2AGTg/jYTUCQ=; b=kxNzKN3oNqosBLld5eHbKgydMkkjVK82FKuDqb3Iv0tAxOrk5DOpXwCchqsG9yfqnA e6MokGemG/6+Fx2dJp/Xwkw4hXEWACfDxn3a3E1Xa1WmuD4JZelUXoLTNg72CnoC0B2r svu8JxmJdYh+AvxvHP6DQcaPsCRbj5k/kxXEa7E7ClfhUeUSrFjypyL22ZOCclprD819 y2s6eJ2/WfqlU1/utdE5hJrr5bnBNrNEck0yLzgtaSMjry+r0UkEdBDTulAC2Tzc6nZR xklnJ/IlpbuvuTBb7LWB/dcFCTBCaMoPzkvkhROZ4FMJxtiLUXYn2FWs8vb+zAZ2bP9Q NY8w== X-Gm-Message-State: AC+VfDwG2eP0PH0BjG60enTCLn/AFZkmnqWDhYO5h7cl2h+DAopbtAmw YZOdE6RKzeTL+7X2XPCa6XOuFKw6JTk= X-Google-Smtp-Source: ACHHUZ5Nh/l9xqVEJl2L+gDDfU6VaT6WMuAHzh+YRNDXhkVSb11V2IiWoGYihSeaRTolCLaFOkyVng== X-Received: by 2002:adf:ed48:0:b0:306:35d2:c33a with SMTP id u8-20020adfed48000000b0030635d2c33amr2329336wro.50.1685472143612; Tue, 30 May 2023 11:42:23 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a14-20020adfe5ce000000b003078354f774sm4166954wrn.36.2023.05.30.11.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:23 -0700 (PDT) Message-Id: <74f43fc727ebb07874b902b0ec64dd0954ffff30.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:06 +0000 Subject: [PATCH v2 08/14] builtin/config.c: test misuse of format_config() Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo current_config_*() functions aren't meant to be called outside of config callbacks because they read state that is only set when iterating through config. However, several sites in builtin/config.c are indirectly calling these functions outside of config callbacks thanks to the format_config() helper. Show the current, bad behavior via tests so that the fixes in a subsequent commit will be clearer. The misbehaving cases are: * "git config --get-urlmatch --show-scope" results in an "unknown" scope, where it arguably should show the config file's scope. It's clear that this wasn't intended, though: we knew that "--get-urlmatch" couldn't show config source metadata, which is why "--show-origin" was marked incompatible with "--get-urlmatch" when it was introduced [1]. It was most likely a mistake that we allowed "--show-scope" to sneak through. * Similarly, "git config --default" doesn't set config source metadata , so "--show-scope" also results in "unknown", and "--show-origin" results in a BUG(). [1] https://lore.kernel.org/git/20160205112001.GA13397@sigill.intra.peff.net/ Signed-off-by: Glen Choo --- t/t1300-config.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 2575279ab84..57fe250b78f 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -1627,6 +1627,21 @@ test_expect_success 'urlmatch' ' test_cmp expect actual ' +test_expect_success 'urlmatch with --show-scope' ' + cat >.git/config <<-\EOF && + [http "https://weak.example.com"] + sslVerify = false + cookieFile = /tmp/cookie.txt + EOF + + cat >expect <<-EOF && + unknown http.cookiefile /tmp/cookie.txt + unknown http.sslverify false + EOF + git config --get-urlmatch --show-scope HTTP https://weak.example.com >actual && + test_cmp expect actual +' + test_expect_success 'urlmatch favors more specific URLs' ' cat >.git/config <<-\EOF && [http "https://example.com/"] @@ -2014,6 +2029,10 @@ test_expect_success '--show-origin blob ref' ' test_cmp expect output ' +test_expect_success '--show-origin with --default' ' + test_must_fail git config --show-origin --default foo some.key +' + test_expect_success '--show-scope with --list' ' cat >expect <<-EOF && global user.global=true @@ -2082,6 +2101,12 @@ test_expect_success '--show-scope with --show-origin' ' test_cmp expect output ' +test_expect_success '--show-scope with --default' ' + git config --show-scope --default foo some.key >actual && + echo "unknown foo" >expect && + test_cmp expect actual +' + test_expect_success 'override global and system config' ' test_when_finished rm -f \"\$HOME\"/.gitconfig && cat >"$HOME"/.gitconfig <<-EOF && From patchwork Tue May 30 18:42:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1994DC77B73 for ; Tue, 30 May 2023 18:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233506AbjE3SnC (ORCPT ); Tue, 30 May 2023 14:43:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233293AbjE3Smd (ORCPT ); Tue, 30 May 2023 14:42:33 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C910FE for ; Tue, 30 May 2023 11:42:26 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f601c57d8dso1425575e9.0 for ; Tue, 30 May 2023 11:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472144; x=1688064144; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=muVsHyyQRsO/AhBQS6yqmvfKFRi4nkq90dnHB48jkFo=; b=D7oCYCfgKyBwN5MbFJM8Q7oxQulIKiVGtcmF+VpTweDRp+Q2hnHqOENOzBBE1k3w25 MbvzszdhoEqSSNu87PdmRRWgf9cwGeRnY0xUvDYmlNsYUE8VsdiPovv6si7GEowx+GBG yji5tYTzLjpRZMUpiS8BCfgxFSajYA//akewXJkNjq2Mh+oZlyj65AylgxrgIqvetDbL ajKwev/noH1GXfEbJdtVz0i/iY89ppi/LGRepDu3/2rmWiP2jfl9pQ4pGRubj1JyeZoj mDpumyQhwi6ifeZEs7G7wqqHqHgy6g+cWuNFrqL2m2AcUDQt921MTTOoeQ3q0U1g1Ole wQaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472144; x=1688064144; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=muVsHyyQRsO/AhBQS6yqmvfKFRi4nkq90dnHB48jkFo=; b=NImNl7C9qJSoH1+kCXA4zpOlb5Z8/2khni4CArdHUj/OeuCumpF3NrEYRG2y4bav84 dfoRXhPyYEZv60glAech5yhmEs0ShffSnVKluVQA9KxbaEzDp20M3A1JduCfwY3zsOgs 1cfXAuTq+cSNLhGxJYSVsNRjbOscrB7D3J07Neynr9kulciTAyGVcROjC3dhw3Us5WHv lKzDsUXfehl0E7icNnBWmE+3YqCp7/xy9GIvbMDMuJ7f4iH9Lg1Pvb16B/f7FGiTGAxw TeUfzkmvqsbpMcjfong9FIXl2ivqm9YbIVDg1VDN6aBmNQpGYBjTFXShLiiYPvU5q9Im p9yw== X-Gm-Message-State: AC+VfDyct2JE5H260+Bpk1jSA9gXaPG0k5Lfu5SYo73hBay+qAtXyJvi ZIUf91TVskmWbHcHDXD3ja/1WwFbEvI= X-Google-Smtp-Source: ACHHUZ7xRQ/bacb54iZXcNBbRgXAGFMP0V30xpkBu6DFH+I9YW80vC/Ew8WIjAwKQbJn7mIqdOpZSQ== X-Received: by 2002:a7b:c448:0:b0:3f4:27ff:7d4e with SMTP id l8-20020a7bc448000000b003f427ff7d4emr2576023wmi.9.1685472144296; Tue, 30 May 2023 11:42:24 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c3-20020a05600c0ac300b003f50e88ffc1sm21949712wmr.0.2023.05.30.11.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:23 -0700 (PDT) Message-Id: <3760015d2c000c59d354bae872c431ee3266e9da.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:07 +0000 Subject: [PATCH v2 09/14] config.c: provide kvi with CLI config Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Refactor out kvi_from_param() from the logic that caches CLI config in configsets, and use it to pass the "kvi" arg to config callbacks when parsing CLI config. Now that "kvi" is always present when config machinery calls config callbacks, plumb "kvi" so that we can replace nearly all calls to current_config_*(). (The exception is an edge case where trace2/*.c calls current_config_scope(). That will be handled in a later commit.) Note that this results in "kvi" containing a different, more complete set of information than the mocked up "struct config_source" in git_config_from_parameters(). Plumbing "kvi" reveals a few places where we've been doing the wrong thing: * git_config_parse_parameter() hasn't been setting config source information, so plumb "kvi" there too. * "git config --get-urlmatch --show-scope" iterates config to collect values, but then attempts to display the scope after config iteration. Fix this by copying the "kvi" arg in the collection phase so that it can be read back later. This means that we can now support "git config --get-urlmatch --show-origin" (we don't allow this combination of args because of this bug), but that is left unchanged for now. * "git config --default" doesn't have config source metadata when displaying the default value. Fix this by treating the default value as if it came from the command line (e.g. like we do with "git -c" or "git config --file"), using kvi_from_param(). Signed-off-by: Glen Choo --- builtin/config.c | 41 ++++++++++++++----------- config.c | 78 ++++++++++++++++++++++------------------------- config.h | 3 +- t/t1300-config.sh | 10 +++--- 4 files changed, 68 insertions(+), 64 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index b2ad7351d0a..2fcad601a7b 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -191,37 +191,37 @@ static void check_argc(int argc, int min, int max) usage_builtin_config(); } -static void show_config_origin(struct strbuf *buf) +static void show_config_origin(struct key_value_info *kvi, struct strbuf *buf) { const char term = end_nul ? '\0' : '\t'; - strbuf_addstr(buf, current_config_origin_type()); + strbuf_addstr(buf, config_origin_type_name(kvi->origin_type)); strbuf_addch(buf, ':'); if (end_nul) - strbuf_addstr(buf, current_config_name()); + strbuf_addstr(buf, kvi->filename ? kvi->filename : ""); else - quote_c_style(current_config_name(), buf, NULL, 0); + quote_c_style(kvi->filename ? kvi->filename : "", buf, NULL, 0); strbuf_addch(buf, term); } -static void show_config_scope(struct strbuf *buf) +static void show_config_scope(struct key_value_info *kvi, struct strbuf *buf) { const char term = end_nul ? '\0' : '\t'; - const char *scope = config_scope_name(current_config_scope()); + const char *scope = config_scope_name(kvi->scope); strbuf_addstr(buf, N_(scope)); strbuf_addch(buf, term); } static int show_all_config(const char *key_, const char *value_, - struct key_value_info *kvi UNUSED, void *cb UNUSED) + struct key_value_info *kvi, void *cb UNUSED) { if (show_origin || show_scope) { struct strbuf buf = STRBUF_INIT; if (show_scope) - show_config_scope(&buf); + show_config_scope(kvi, &buf); if (show_origin) - show_config_origin(&buf); + show_config_origin(kvi, &buf); /* Use fwrite as "buf" can contain \0's if "end_null" is set. */ fwrite(buf.buf, 1, buf.len, stdout); strbuf_release(&buf); @@ -239,12 +239,13 @@ struct strbuf_list { int alloc; }; -static int format_config(struct strbuf *buf, const char *key_, const char *value_) +static int format_config(struct strbuf *buf, const char *key_, + const char *value_, struct key_value_info *kvi) { if (show_scope) - show_config_scope(buf); + show_config_scope(kvi, buf); if (show_origin) - show_config_origin(buf); + show_config_origin(kvi, buf); if (show_keys) strbuf_addstr(buf, key_); if (!omit_values) { @@ -299,7 +300,7 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value } static int collect_config(const char *key_, const char *value_, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { struct strbuf_list *values = cb; @@ -316,7 +317,7 @@ static int collect_config(const char *key_, const char *value_, ALLOC_GROW(values->items, values->nr + 1, values->alloc); strbuf_init(&values->items[values->nr], 0); - return format_config(&values->items[values->nr++], key_, value_); + return format_config(&values->items[values->nr++], key_, value_, kvi); } static int get_value(const char *key_, const char *regex_, unsigned flags) @@ -377,11 +378,14 @@ static int get_value(const char *key_, const char *regex_, unsigned flags) &given_config_source, &config_options); if (!values.nr && default_value) { + struct key_value_info kvi = { 0 }; struct strbuf *item; + + kvi_from_param(&kvi); ALLOC_GROW(values.items, values.nr + 1, values.alloc); item = &values.items[values.nr++]; strbuf_init(item, 0); - if (format_config(item, key_, default_value) < 0) + if (format_config(item, key_, default_value, &kvi) < 0) die(_("failed to format default config value: %s"), default_value); } @@ -556,10 +560,11 @@ static void check_write(void) struct urlmatch_current_candidate_value { char value_is_null; struct strbuf value; + struct key_value_info kvi; }; static int urlmatch_collect_fn(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { struct string_list *values = cb; struct string_list_item *item = string_list_insert(values, var); @@ -572,6 +577,7 @@ static int urlmatch_collect_fn(const char *var, const char *value, } else { strbuf_reset(&matched->value); } + memcpy(&matched->kvi, kvi, sizeof(struct key_value_info)); if (value) { strbuf_addstr(&matched->value, value); @@ -618,7 +624,8 @@ static int get_urlmatch(const char *var, const char *url) struct strbuf buf = STRBUF_INIT; format_config(&buf, item->string, - matched->value_is_null ? NULL : matched->value.buf); + matched->value_is_null ? NULL : matched->value.buf, + &matched->kvi); fwrite(buf.buf, 1, buf.len, stdout); strbuf_release(&buf); diff --git a/config.c b/config.c index 4b6830fcc79..1779fe62f89 100644 --- a/config.c +++ b/config.c @@ -211,7 +211,9 @@ static const char include_depth_advice[] = N_( "from\n" " %s\n" "This might be due to circular includes."); -static int handle_path_include(struct config_source *cs, const char *path, +static int handle_path_include(struct config_source *cs, + struct key_value_info *kvi, + const char *path, struct config_include_data *inc) { int ret = 0; @@ -252,8 +254,7 @@ static int handle_path_include(struct config_source *cs, const char *path, cs->name ? cs->name : "the command line"); ret = git_config_from_file_with_options(git_config_include, path, inc, - current_config_scope(), - NULL); + kvi->scope, NULL); inc->depth--; } cleanup: @@ -500,7 +501,7 @@ static int git_config_include(const char *var, const char *value, return ret; if (!strcmp(var, "include.path")) - ret = handle_path_include(cs, value, inc); + ret = handle_path_include(cs, kvi, value, inc); if (!parse_config_key(var, "includeif", &cond, &cond_len, &key) && cond && include_condition_is_true(cs, inc, cond, cond_len) && @@ -509,7 +510,7 @@ static int git_config_include(const char *var, const char *value, if (inc->opts->unconditional_remote_url) inc->fn = forbid_remote_url; - ret = handle_path_include(cs, value, inc); + ret = handle_path_include(cs, kvi, value, inc); inc->fn = old_fn; } @@ -667,7 +668,8 @@ out_free_ret_1: } static int config_parse_pair(const char *key, const char *value, - config_fn_t fn, void *data) + struct key_value_info *kvi, + config_fn_t fn, void *data) { char *canonical_name; int ret; @@ -677,17 +679,30 @@ static int config_parse_pair(const char *key, const char *value, if (git_config_parse_key(key, &canonical_name, NULL)) return -1; - ret = (fn(canonical_name, value, NULL, data) < 0) ? -1 : 0; + ret = (fn(canonical_name, value, kvi, data) < 0) ? -1 : 0; free(canonical_name); return ret; } + +/* for values read from `git_config_from_parameters()` */ +void kvi_from_param(struct key_value_info *out) +{ + out->filename = NULL; + out->linenr = -1; + out->origin_type = CONFIG_ORIGIN_CMDLINE; + out->scope = CONFIG_SCOPE_COMMAND; +} + int git_config_parse_parameter(const char *text, config_fn_t fn, void *data) { const char *value; struct strbuf **pair; int ret; + struct key_value_info kvi = { 0 }; + + kvi_from_param(&kvi); pair = strbuf_split_str(text, '=', 2); if (!pair[0]) @@ -706,12 +721,13 @@ int git_config_parse_parameter(const char *text, return error(_("bogus config parameter: %s"), text); } - ret = config_parse_pair(pair[0]->buf, value, fn, data); + ret = config_parse_pair(pair[0]->buf, value, &kvi, fn, data); strbuf_list_free(pair); return ret; } -static int parse_config_env_list(char *env, config_fn_t fn, void *data) +static int parse_config_env_list(char *env, struct key_value_info *kvi, + config_fn_t fn, void *data) { char *cur = env; while (cur && *cur) { @@ -745,7 +761,7 @@ static int parse_config_env_list(char *env, config_fn_t fn, void *data) CONFIG_DATA_ENVIRONMENT); } - if (config_parse_pair(key, value, fn, data) < 0) + if (config_parse_pair(key, value, kvi, fn, data) < 0) return -1; } else { @@ -770,10 +786,13 @@ int git_config_from_parameters(config_fn_t fn, void *data) int ret = 0; char *envw = NULL; struct config_source source = CONFIG_SOURCE_INIT; + struct key_value_info kvi = { 0 }; source.origin_type = CONFIG_ORIGIN_CMDLINE; config_reader_push_source(&the_reader, &source); + kvi_from_param(&kvi); + env = getenv(CONFIG_COUNT_ENVIRONMENT); if (env) { unsigned long count; @@ -809,7 +828,7 @@ int git_config_from_parameters(config_fn_t fn, void *data) } strbuf_reset(&envvar); - if (config_parse_pair(key, value, fn, data) < 0) { + if (config_parse_pair(key, value, &kvi, fn, data) < 0) { ret = -1; goto out; } @@ -820,7 +839,7 @@ int git_config_from_parameters(config_fn_t fn, void *data) if (env) { /* sq_dequote will write over it */ envw = xstrdup(env); - if (parse_config_env_list(envw, fn, data) < 0) { + if (parse_config_env_list(envw, &kvi, fn, data) < 0) { ret = -1; goto out; } @@ -2422,7 +2441,8 @@ static int configset_find_element(struct config_set *set, const char *key, return 0; } -static int configset_add_value(struct config_reader *reader, +static int configset_add_value(struct key_value_info *kvi_p, + struct config_reader *reader, struct config_set *set, const char *key, const char *value) { @@ -2453,16 +2473,10 @@ static int configset_add_value(struct config_reader *reader, l_item->e = e; l_item->value_index = e->value_list.nr - 1; - if (!reader->source) - BUG("configset_add_value has no source"); if (reader->source->name) { - kvi_from_source(reader->source, current_config_scope(), kv_info); + kvi_from_source(reader->source, kvi_p->scope, kv_info); } else { - /* for values read from `git_config_from_parameters()` */ - kv_info->filename = NULL; - kv_info->linenr = -1; - kv_info->origin_type = CONFIG_ORIGIN_CMDLINE; - kv_info->scope = reader->parsing_scope; + kvi_from_param(kv_info); } si->util = kv_info; @@ -2518,10 +2532,10 @@ struct configset_add_data { #define CONFIGSET_ADD_INIT { 0 } static int config_set_callback(const char *key, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { struct configset_add_data *data = cb; - configset_add_value(data->config_reader, data->config_set, key, value); + configset_add_value(kvi, data->config_reader, data->config_set, key, value); return 0; } @@ -4000,16 +4014,6 @@ const char *config_origin_type_name(enum config_origin_type type) } } -const char *current_config_origin_type(void) -{ - enum config_origin_type type = CONFIG_ORIGIN_UNKNOWN; - - if (reader_origin_type(&the_reader, &type)) - BUG("current_config_origin_type called outside config callback"); - - return config_origin_type_name(type); -} - const char *config_scope_name(enum config_scope scope) { switch (scope) { @@ -4041,14 +4045,6 @@ static int reader_config_name(struct config_reader *reader, const char **out) return 0; } -const char *current_config_name(void) -{ - const char *name; - if (reader_config_name(&the_reader, &name)) - BUG("current_config_name called outside config callback"); - return name ? name : ""; -} - enum config_scope current_config_scope(void) { if (the_reader.config_kvi) diff --git a/config.h b/config.h index ca5aac62980..fe7c1b79f80 100644 --- a/config.h +++ b/config.h @@ -367,9 +367,8 @@ void git_global_config(char **user, char **xdg); int git_config_parse_parameter(const char *, config_fn_t fn, void *data); enum config_scope current_config_scope(void); -const char *current_config_origin_type(void); -const char *current_config_name(void); const char *config_origin_type_name(enum config_origin_type type); +void kvi_from_param(struct key_value_info *out); /* * Match and parse a config key of the form: diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 57fe250b78f..028998dadc4 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -1635,8 +1635,8 @@ test_expect_success 'urlmatch with --show-scope' ' EOF cat >expect <<-EOF && - unknown http.cookiefile /tmp/cookie.txt - unknown http.sslverify false + local http.cookiefile /tmp/cookie.txt + local http.sslverify false EOF git config --get-urlmatch --show-scope HTTP https://weak.example.com >actual && test_cmp expect actual @@ -2030,7 +2030,9 @@ test_expect_success '--show-origin blob ref' ' ' test_expect_success '--show-origin with --default' ' - test_must_fail git config --show-origin --default foo some.key + git config --show-origin --default foo some.key >actual && + echo "command line: foo" >expect && + test_cmp expect actual ' test_expect_success '--show-scope with --list' ' @@ -2103,7 +2105,7 @@ test_expect_success '--show-scope with --show-origin' ' test_expect_success '--show-scope with --default' ' git config --show-scope --default foo some.key >actual && - echo "unknown foo" >expect && + echo "command foo" >expect && test_cmp expect actual ' From patchwork Tue May 30 18:42:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260974 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B904AC7EE24 for ; Tue, 30 May 2023 18:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233510AbjE3SnF (ORCPT ); Tue, 30 May 2023 14:43:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231234AbjE3Sme (ORCPT ); Tue, 30 May 2023 14:42:34 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B66D8102 for ; Tue, 30 May 2023 11:42:26 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f61530506aso51387765e9.1 for ; Tue, 30 May 2023 11:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472145; x=1688064145; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eQ0tgNLdFxz0EYeV+2QwVckoThy+wAOtXXKmq/QEWec=; b=sZUPAE6GA35oNzwup8FlrWnqyBfl9z3GhAmP+yu/lsdLtAYyxdHdtHP5ZEF0FtuWQr 1BOIjpAnKLTspHrm3UeEsR5aKhQyCu8a0tfEryPKPHzuI43k3S0jTFv+jWZc2/K0Vdys L0/3VcsG5aC1YgLguALBgvws5OrbGwLkTQ850VW62NkW1CYpv2Nd2bkX1IZ7ra0f7xEQ TFLEbFxXuVJJH7HFzAQ9LI2EN/FeQRBAJqWxUiFTyc+Wg/z5RLeSsysvagL9kRyK0pwZ tBXIByUn8k1KfFaO3TQzwPsJqCmSbTsJ3yJspab9sEKXsfU5hVEjQHpag+wn9kGaJD4K mKtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472145; x=1688064145; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eQ0tgNLdFxz0EYeV+2QwVckoThy+wAOtXXKmq/QEWec=; b=gNX9P/DzhTdTnnYagJQ3UsFs7RYnJmLyak3FT/W1ugFEJb3KEaGA2zD6bJ/TvFH+SJ rzz1iiFdzxN2PJuwhGphww6Ka5j+AWkjG3W0AzaHg71PnapP3NfouE0chyVSVYL+B3yV JIUkmR+Sv6Qrc1TbFu0kEfWLMYK9GzDnt0m/8976gWA5mq7FNmOiIOcI7kuZKU8TvRen EgdbC6OYsSPPTp90Uqt9qdlKyE9RMrJtJSyIAmAWi0nTH2N9B0lwf7T7EoIiOSIGEX97 TLJR58RwWeRDdC+ha/b5V4KKZP0qDDyStX2P3vtwE4iD4dpuDceF8ayuVAeTA3mvaJa+ fwow== X-Gm-Message-State: AC+VfDzDMcbxMMtb/vq07MfoVlfM/opJBrEWSubo4egeugf6GXB9NdPP +L9QssEx7Vex3z1DgDGrvOPKl5oH888= X-Google-Smtp-Source: ACHHUZ4EjYTg5BsDrvkn5QPJSQd1jadwIc5WPCIBF6Qs7IrclUF3jlEqO/EF+jfvaQkfPXfL/dCnCA== X-Received: by 2002:a7b:c387:0:b0:3f4:e4a2:9f7f with SMTP id s7-20020a7bc387000000b003f4e4a29f7fmr2633421wmj.36.1685472144808; Tue, 30 May 2023 11:42:24 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u20-20020a05600c211400b003f4ebeaa970sm18178896wml.25.2023.05.30.11.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:24 -0700 (PDT) Message-Id: <7dc0c46b864665dad87a5e0e32c6a8c36afa4673.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:08 +0000 Subject: [PATCH v2 10/14] trace2: plumb config kvi Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo There is a code path starting from trace2_def_param_fl() that eventually calls current_config_scope(), and thus it needs to have "kvi" plumbed through it. Additional plumbing is also needed to get "kvi" to trace2_def_param_fl(), which gets called by two code paths: - Through tr2_cfg_cb(), which is a config callback, so it trivially receives "kvi". - Through tr2_list_env_vars_fl(), which is a high level function that lists environment variables for tracing. This has been secretly behaving like git_config_from_parameters() (in that it parses config from environment variables/the CLI), but does not set config source information. Teach tr2_list_env_vars_fl() to be well-behaved by using kvi_from_param(), which is used elsewhere for CLI/environment variable-based config. As a result, current_config_scope() has no more callers, so remove it. Signed-off-by: Glen Choo --- config.c | 46 ----------------------------------------- config.h | 1 - trace2.c | 4 ++-- trace2.h | 3 ++- trace2/tr2_cfg.c | 9 +++++--- trace2/tr2_tgt.h | 4 +++- trace2/tr2_tgt_event.c | 4 ++-- trace2/tr2_tgt_normal.c | 4 ++-- trace2/tr2_tgt_perf.c | 4 ++-- 9 files changed, 19 insertions(+), 60 deletions(-) diff --git a/config.c b/config.c index 1779fe62f89..819e9e5966c 100644 --- a/config.c +++ b/config.c @@ -78,16 +78,6 @@ struct config_reader { */ struct config_source *source; struct key_value_info *config_kvi; - /* - * The "scope" of the current config source being parsed (repo, global, - * etc). Like "source", this is only set when parsing a config source. - * It's not part of "source" because it transcends a single file (i.e., - * a file included from .git/config is still in "repo" scope). - * - * When iterating through a configset, the equivalent value is - * "config_kvi.scope" (see above). - */ - enum config_scope parsing_scope; }; /* * Where possible, prefer to accept "struct config_reader" as an arg than to use @@ -118,19 +108,9 @@ static inline struct config_source *config_reader_pop_source(struct config_reade static inline void config_reader_set_kvi(struct config_reader *reader, struct key_value_info *kvi) { - if (kvi && (reader->source || reader->parsing_scope)) - BUG("kvi should not be set while parsing a config source"); reader->config_kvi = kvi; } -static inline void config_reader_set_scope(struct config_reader *reader, - enum config_scope scope) -{ - if (scope && reader->config_kvi) - BUG("scope should only be set when iterating through a config source"); - reader->parsing_scope = scope; -} - static int pack_compression_seen; static int zlib_compression_seen; @@ -404,18 +384,12 @@ static void populate_remote_urls(struct config_include_data *inc) { struct config_options opts; - enum config_scope store_scope = inc->config_reader->parsing_scope; - opts = *inc->opts; opts.unconditional_remote_url = 1; - config_reader_set_scope(inc->config_reader, 0); - inc->remote_urls = xmalloc(sizeof(*inc->remote_urls)); string_list_init_dup(inc->remote_urls); config_with_options(add_remote_url, inc->remote_urls, inc->config_source, &opts); - - config_reader_set_scope(inc->config_reader, store_scope); } static int forbid_remote_url(const char *var, const char *value UNUSED, @@ -2242,7 +2216,6 @@ static int do_git_config_sequence(struct config_reader *reader, char *xdg_config = NULL; char *user_config = NULL; char *repo_config; - enum config_scope prev_parsing_scope = reader->parsing_scope; if (opts->commondir) repo_config = mkpathdup("%s/config", opts->commondir); @@ -2251,7 +2224,6 @@ static int do_git_config_sequence(struct config_reader *reader, else repo_config = NULL; - config_reader_set_scope(reader, CONFIG_SCOPE_SYSTEM); if (git_config_system() && system_config && !access_or_die(system_config, R_OK, opts->system_gently ? ACCESS_EACCES_OK : 0)) @@ -2259,7 +2231,6 @@ static int do_git_config_sequence(struct config_reader *reader, data, CONFIG_SCOPE_SYSTEM, NULL); - config_reader_set_scope(reader, CONFIG_SCOPE_GLOBAL); git_global_config(&user_config, &xdg_config); if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) @@ -2270,13 +2241,11 @@ static int do_git_config_sequence(struct config_reader *reader, ret += git_config_from_file_with_options(fn, user_config, data, CONFIG_SCOPE_GLOBAL, NULL); - config_reader_set_scope(reader, CONFIG_SCOPE_LOCAL); if (!opts->ignore_repo && repo_config && !access_or_die(repo_config, R_OK, 0)) ret += git_config_from_file_with_options(fn, repo_config, data, CONFIG_SCOPE_LOCAL, NULL); - config_reader_set_scope(reader, CONFIG_SCOPE_WORKTREE); if (!opts->ignore_worktree && repository_format_worktree_config) { char *path = git_pathdup("config.worktree"); if (!access_or_die(path, R_OK, 0)) @@ -2286,11 +2255,9 @@ static int do_git_config_sequence(struct config_reader *reader, free(path); } - config_reader_set_scope(reader, CONFIG_SCOPE_COMMAND); if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0) die(_("unable to parse command-line config")); - config_reader_set_scope(reader, prev_parsing_scope); free(system_config); free(xdg_config); free(user_config); @@ -2303,7 +2270,6 @@ int config_with_options(config_fn_t fn, void *data, const struct config_options *opts) { struct config_include_data inc = CONFIG_INCLUDE_INIT; - enum config_scope prev_scope = the_reader.parsing_scope; int ret; if (opts->respect_includes) { @@ -2316,9 +2282,6 @@ int config_with_options(config_fn_t fn, void *data, data = &inc; } - if (config_source) - config_reader_set_scope(&the_reader, config_source->scope); - /* * If we have a specific filename, use it. Otherwise, follow the * regular lookup sequence. @@ -2342,7 +2305,6 @@ int config_with_options(config_fn_t fn, void *data, string_list_clear(inc.remote_urls, 0); FREE_AND_NULL(inc.remote_urls); } - config_reader_set_scope(&the_reader, prev_scope); return ret; } @@ -4045,14 +4007,6 @@ static int reader_config_name(struct config_reader *reader, const char **out) return 0; } -enum config_scope current_config_scope(void) -{ - if (the_reader.config_kvi) - return the_reader.config_kvi->scope; - else - return the_reader.parsing_scope; -} - int lookup_config(const char **mapping, int nr_mapping, const char *var) { int i; diff --git a/config.h b/config.h index fe7c1b79f80..9e3c2bdb429 100644 --- a/config.h +++ b/config.h @@ -366,7 +366,6 @@ void git_global_config(char **user, char **xdg); int git_config_parse_parameter(const char *, config_fn_t fn, void *data); -enum config_scope current_config_scope(void); const char *config_origin_type_name(enum config_origin_type type); void kvi_from_param(struct key_value_info *out); diff --git a/trace2.c b/trace2.c index e8ba62c0c3d..f519a3514b6 100644 --- a/trace2.c +++ b/trace2.c @@ -632,7 +632,7 @@ void trace2_thread_exit_fl(const char *file, int line) } void trace2_def_param_fl(const char *file, int line, const char *param, - const char *value) + const char *value, struct key_value_info *kvi) { struct tr2_tgt *tgt_j; int j; @@ -642,7 +642,7 @@ void trace2_def_param_fl(const char *file, int line, const char *param, for_each_wanted_builtin (j, tgt_j) if (tgt_j->pfn_param_fl) - tgt_j->pfn_param_fl(file, line, param, value); + tgt_j->pfn_param_fl(file, line, param, value, kvi); } void trace2_def_repo_fl(const char *file, int line, struct repository *repo) diff --git a/trace2.h b/trace2.h index 4ced30c0db3..af06f66739e 100644 --- a/trace2.h +++ b/trace2.h @@ -325,6 +325,7 @@ void trace2_thread_exit_fl(const char *file, int line); #define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__) +struct key_value_info; /* * Emits a "def_param" message containing a key/value pair. * @@ -334,7 +335,7 @@ void trace2_thread_exit_fl(const char *file, int line); * `core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`. */ void trace2_def_param_fl(const char *file, int line, const char *param, - const char *value); + const char *value, struct key_value_info *kvi); #define trace2_def_param(param, value) \ trace2_def_param_fl(__FILE__, __LINE__, (param), (value)) diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c index 8ed139c69f4..1450c9bec71 100644 --- a/trace2/tr2_cfg.c +++ b/trace2/tr2_cfg.c @@ -100,7 +100,7 @@ struct tr2_cfg_data { * See if the given config key matches any of our patterns of interest. */ static int tr2_cfg_cb(const char *key, const char *value, - struct key_value_info *kvi UNUSED, void *d) + struct key_value_info *kvi, void *d) { struct strbuf **s; struct tr2_cfg_data *data = (struct tr2_cfg_data *)d; @@ -109,7 +109,8 @@ static int tr2_cfg_cb(const char *key, const char *value, struct strbuf *buf = *s; int wm = wildmatch(buf->buf, key, WM_CASEFOLD); if (wm == WM_MATCH) { - trace2_def_param_fl(data->file, data->line, key, value); + trace2_def_param_fl(data->file, data->line, key, value, + kvi); return 0; } } @@ -127,8 +128,10 @@ void tr2_cfg_list_config_fl(const char *file, int line) void tr2_list_env_vars_fl(const char *file, int line) { + struct key_value_info kvi = { 0 }; struct strbuf **s; + kvi_from_param(&kvi); if (tr2_load_env_vars() <= 0) return; @@ -136,7 +139,7 @@ void tr2_list_env_vars_fl(const char *file, int line) struct strbuf *buf = *s; const char *val = getenv(buf->buf); if (val && *val) - trace2_def_param_fl(file, line, buf->buf, val); + trace2_def_param_fl(file, line, buf->buf, val, &kvi); } } diff --git a/trace2/tr2_tgt.h b/trace2/tr2_tgt.h index bf8745c4f05..9c88ca9beed 100644 --- a/trace2/tr2_tgt.h +++ b/trace2/tr2_tgt.h @@ -69,8 +69,10 @@ typedef void(tr2_tgt_evt_exec_result_fl_t)(const char *file, int line, uint64_t us_elapsed_absolute, int exec_id, int code); +struct key_value_info; typedef void(tr2_tgt_evt_param_fl_t)(const char *file, int line, - const char *param, const char *value); + const char *param, const char *value, + struct key_value_info *kvi); typedef void(tr2_tgt_evt_repo_fl_t)(const char *file, int line, const struct repository *repo); diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c index 9e7aab6d510..83db3c755bd 100644 --- a/trace2/tr2_tgt_event.c +++ b/trace2/tr2_tgt_event.c @@ -476,11 +476,11 @@ static void fn_exec_result_fl(const char *file, int line, } static void fn_param_fl(const char *file, int line, const char *param, - const char *value) + const char *value, struct key_value_info *kvi) { const char *event_name = "def_param"; struct json_writer jw = JSON_WRITER_INIT; - enum config_scope scope = current_config_scope(); + enum config_scope scope = kvi->scope; const char *scope_name = config_scope_name(scope); jw_object_begin(&jw, 0); diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 8672c2c2d04..65e9be9c5a4 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -296,10 +296,10 @@ static void fn_exec_result_fl(const char *file, int line, } static void fn_param_fl(const char *file, int line, const char *param, - const char *value) + const char *value, struct key_value_info *kvi) { struct strbuf buf_payload = STRBUF_INIT; - enum config_scope scope = current_config_scope(); + enum config_scope scope = kvi->scope; const char *scope_name = config_scope_name(scope); strbuf_addf(&buf_payload, "def_param scope:%s %s=%s", scope_name, param, diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index 3f2b2d53118..f402f6e3813 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -438,12 +438,12 @@ static void fn_exec_result_fl(const char *file, int line, } static void fn_param_fl(const char *file, int line, const char *param, - const char *value) + const char *value, struct key_value_info *kvi) { const char *event_name = "def_param"; struct strbuf buf_payload = STRBUF_INIT; struct strbuf scope_payload = STRBUF_INIT; - enum config_scope scope = current_config_scope(); + enum config_scope scope = kvi->scope; const char *scope_name = config_scope_name(scope); strbuf_addf(&buf_payload, "%s:%s", param, value); From patchwork Tue May 30 18:42:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19DF7C7EE2F for ; Tue, 30 May 2023 18:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233499AbjE3SnQ (ORCPT ); Tue, 30 May 2023 14:43:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233497AbjE3Sm4 (ORCPT ); Tue, 30 May 2023 14:42:56 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD7DA10D for ; Tue, 30 May 2023 11:42:27 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-307d20548adso3253575f8f.0 for ; Tue, 30 May 2023 11:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472146; x=1688064146; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=uVX+RnEbkYq04c8WwByiGOAryjzsikZWdWyouGrSX18=; b=QPfJsefSp383QA2ihpZtEhXtSrxXZ3VtnUKMKrSHWmemHAwFoiURfu2PGzU/ysb2RN Z083mKtIeLn/H98MweGw6e5p2AQAjCQgjZOosd4fjeLEQefclviBE1NrTneb+UZSL2ho s4k1E8j2Gd7S19lFnGremMLG2tb+jTCbf9Mq0+NrccIRExFuL3nZd5xV+Y47Ugs6jyrd n7C6zQN0OW39OjEBL7TpLl6LPqFXZjStef3Hb8fqJfXjYLjewg0RD839Bn5Ij3AR/VPD wHAV+oZ1ofm+DKwxYtRLMVmfv2yeMXYtMkHsaDLCdwO1coi9HMKFpj/ft/dyf/U62U49 VNUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472146; x=1688064146; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uVX+RnEbkYq04c8WwByiGOAryjzsikZWdWyouGrSX18=; b=NqdBjPtq+qZoQzwWzgiucV/gzh2X0L9OmWTmbJIh4YH13UYMGxQ3GrnmaNdT7WRhOD 0Z6thjNcQFjJ9fVEqrdzTjCVOyFL0Cyb37CtJrlGPXnB27IYeW+YVdM3CICxqvJGo4PD MEHuGIlPLuB5wdMLGn/vlrxYuT6OlsPjK/NBN0nTqOxNz5yG6Ej270/zx3MgGpS7PMPB dEHYpi+Yd8UBx/ZBaQYMWkBGnVmKQWQK1yhFhT/DtxDFU5qxEQw0E+XW6Nk/lF2fmx71 57Q2H+o29SGoeeOASUQIKYIfeKi8EjP823SA69a6B1zcJgqRPq/W268OvuSjDjHkisNp YE5A== X-Gm-Message-State: AC+VfDw6a8vdojSZJxJr1ob2G9JEXYX/nDEEkkDZOpQ1sIdNWgIOkcNS 899QHPbP/rHM4qiR4Oan0KNxwXllAug= X-Google-Smtp-Source: ACHHUZ5A3Bgs6BBpneWGg0uGAXBl5BdsCn/u/CZggDqCsMHV2qu+DUAODSD/ZnpMDE0tGpaHYtJn1g== X-Received: by 2002:a5d:6943:0:b0:30a:e3de:42c7 with SMTP id r3-20020a5d6943000000b0030ae3de42c7mr2045606wrw.22.1685472145633; Tue, 30 May 2023 11:42:25 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o11-20020adfeacb000000b0030ae7bd1737sm4154634wrn.45.2023.05.30.11.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:25 -0700 (PDT) Message-Id: <504eb206b5a1ac12676752d68b2e2569dc6737ef.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:09 +0000 Subject: [PATCH v2 11/14] config: pass kvi to die_bad_number() Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Plumb "struct key_value_info" through all code paths that end in die_bad_number(), which lets us remove the helper functions that read analogous values from "struct config_reader". As a result, nothing reads config_reader.config_kvi any more, so remove that too. In config.c, this requires changing the signature of git_configset_get_value() to 'return' "kvi" in an out parameter so that git_configset_get_() can pass it to git_config_(). Outside of config.c, config callbacks now need to pass "kvi" to any of the git_config_() functions that parse a config string into a number type. Included is a .cocci patch to make that refactor. In cases where "kvi" would never be used, pass NULL, e.g.: - In config.c, when we are parsing a boolean instead of a number - In builtin/config.c, when calling normalize_value() before setting config to something the user gave us. Signed-off-by: Glen Choo --- archive-tar.c | 4 +- builtin/commit-graph.c | 4 +- builtin/commit.c | 10 +- builtin/config.c | 20 +-- builtin/fetch.c | 4 +- builtin/fsmonitor--daemon.c | 6 +- builtin/grep.c | 2 +- builtin/index-pack.c | 4 +- builtin/log.c | 2 +- builtin/pack-objects.c | 14 +- builtin/receive-pack.c | 10 +- builtin/submodule--helper.c | 4 +- config.c | 153 ++++++++------------- config.h | 14 +- contrib/coccinelle/git_config_number.cocci | 27 ++++ diff.c | 9 +- fmt-merge-msg.c | 2 +- help.c | 5 +- http.c | 10 +- imap-send.c | 2 +- sequencer.c | 22 +-- setup.c | 2 +- submodule-config.c | 15 +- submodule-config.h | 3 +- t/helper/test-config.c | 6 +- upload-pack.c | 12 +- worktree.c | 2 +- 27 files changed, 182 insertions(+), 186 deletions(-) create mode 100644 contrib/coccinelle/git_config_number.cocci diff --git a/archive-tar.c b/archive-tar.c index dcfbce5225a..1cd6d72d21e 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -411,14 +411,14 @@ static int tar_filter_config(const char *var, const char *value, } static int git_tar_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *cb) + struct key_value_info *kvi, void *cb) { if (!strcmp(var, "tar.umask")) { if (value && !strcmp(value, "user")) { tar_umask = umask(0); umask(tar_umask); } else { - tar_umask = git_config_int(var, value); + tar_umask = git_config_int(var, value, kvi); } return 0; } diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index e811866b5dd..c99804abc7e 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -185,11 +185,11 @@ static int write_option_max_new_filters(const struct option *opt, } static int git_commit_graph_write_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, + struct key_value_info *kvi, void *cb UNUSED) { if (!strcmp(var, "commitgraph.maxnewfilters")) - write_opts.max_new_filters = git_config_int(var, value); + write_opts.max_new_filters = git_config_int(var, value, kvi); /* * No need to fall-back to 'git_default_config', since this was already * called in 'cmd_commit_graph()'. diff --git a/builtin/commit.c b/builtin/commit.c index ec468e87039..e846355ec39 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1412,7 +1412,8 @@ static int git_status_config(const char *k, const char *v, return git_column_config(k, v, "status", &s->colopts); if (!strcmp(k, "status.submodulesummary")) { int is_bool; - s->submodule_summary = git_config_bool_or_int(k, v, &is_bool); + s->submodule_summary = git_config_bool_or_int(k, v, kvi, + &is_bool); if (is_bool && s->submodule_summary) s->submodule_summary = -1; return 0; @@ -1472,11 +1473,11 @@ static int git_status_config(const char *k, const char *v, } if (!strcmp(k, "diff.renamelimit")) { if (s->rename_limit == -1) - s->rename_limit = git_config_int(k, v); + s->rename_limit = git_config_int(k, v, kvi); return 0; } if (!strcmp(k, "status.renamelimit")) { - s->rename_limit = git_config_int(k, v); + s->rename_limit = git_config_int(k, v, kvi); return 0; } if (!strcmp(k, "diff.renames")) { @@ -1622,7 +1623,8 @@ static int git_commit_config(const char *k, const char *v, } if (!strcmp(k, "commit.verbose")) { int is_bool; - config_commit_verbose = git_config_bool_or_int(k, v, &is_bool); + config_commit_verbose = git_config_bool_or_int(k, v, kvi, + &is_bool); return 0; } diff --git a/builtin/config.c b/builtin/config.c index 2fcad601a7b..0a33bea26c0 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -254,13 +254,14 @@ static int format_config(struct strbuf *buf, const char *key_, if (type == TYPE_INT) strbuf_addf(buf, "%"PRId64, - git_config_int64(key_, value_ ? value_ : "")); + git_config_int64(key_, value_ ? value_ : "", kvi)); else if (type == TYPE_BOOL) strbuf_addstr(buf, git_config_bool(key_, value_) ? "true" : "false"); else if (type == TYPE_BOOL_OR_INT) { int is_bool, v; - v = git_config_bool_or_int(key_, value_, &is_bool); + v = git_config_bool_or_int(key_, value_, kvi, + &is_bool); if (is_bool) strbuf_addstr(buf, v ? "true" : "false"); else @@ -414,7 +415,8 @@ free_strings: return ret; } -static char *normalize_value(const char *key, const char *value) +static char *normalize_value(const char *key, const char *value, + struct key_value_info *kvi) { if (!value) return NULL; @@ -429,12 +431,12 @@ static char *normalize_value(const char *key, const char *value) */ return xstrdup(value); if (type == TYPE_INT) - return xstrfmt("%"PRId64, git_config_int64(key, value)); + return xstrfmt("%"PRId64, git_config_int64(key, value, kvi)); if (type == TYPE_BOOL) return xstrdup(git_config_bool(key, value) ? "true" : "false"); if (type == TYPE_BOOL_OR_INT) { int is_bool, v; - v = git_config_bool_or_int(key, value, &is_bool); + v = git_config_bool_or_int(key, value, kvi, &is_bool); if (!is_bool) return xstrfmt("%d", v); else @@ -876,7 +878,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (actions == ACTION_SET) { check_write(); check_argc(argc, 2, 2); - value = normalize_value(argv[0], argv[1]); + value = normalize_value(argv[0], argv[1], NULL); ret = git_config_set_in_file_gently(given_config_source.file, argv[0], value); if (ret == CONFIG_NOTHING_SET) error(_("cannot overwrite multiple values with a single value\n" @@ -885,7 +887,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (actions == ACTION_SET_ALL) { check_write(); check_argc(argc, 2, 3); - value = normalize_value(argv[0], argv[1]); + value = normalize_value(argv[0], argv[1], NULL); ret = git_config_set_multivar_in_file_gently(given_config_source.file, argv[0], value, argv[2], flags); @@ -893,7 +895,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (actions == ACTION_ADD) { check_write(); check_argc(argc, 2, 2); - value = normalize_value(argv[0], argv[1]); + value = normalize_value(argv[0], argv[1], NULL); ret = git_config_set_multivar_in_file_gently(given_config_source.file, argv[0], value, CONFIG_REGEX_NONE, @@ -902,7 +904,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (actions == ACTION_REPLACE_ALL) { check_write(); check_argc(argc, 2, 3); - value = normalize_value(argv[0], argv[1]); + value = normalize_value(argv[0], argv[1], NULL); ret = git_config_set_multivar_in_file_gently(given_config_source.file, argv[0], value, argv[2], flags | CONFIG_FLAGS_MULTI_REPLACE); diff --git a/builtin/fetch.c b/builtin/fetch.c index aa688291613..04cf5518d2c 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -125,7 +125,7 @@ static int git_fetch_config(const char *k, const char *v, } if (!strcmp(k, "submodule.fetchjobs")) { - submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v); + submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v, kvi); return 0; } else if (!strcmp(k, "fetch.recursesubmodules")) { recurse_submodules = parse_fetch_recurse_submodules_arg(k, v); @@ -133,7 +133,7 @@ static int git_fetch_config(const char *k, const char *v, } if (!strcmp(k, "fetch.parallel")) { - fetch_parallel_config = git_config_int(k, v); + fetch_parallel_config = git_config_int(k, v, kvi); if (fetch_parallel_config < 0) die(_("fetch.parallel cannot be negative")); if (!fetch_parallel_config) diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index a7375d61d02..cde4a575836 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -40,7 +40,7 @@ static int fsmonitor_config(const char *var, const char *value, struct key_value_info *kvi, void *cb) { if (!strcmp(var, FSMONITOR__IPC_THREADS)) { - int i = git_config_int(var, value); + int i = git_config_int(var, value, kvi); if (i < 1) return error(_("value of '%s' out of range: %d"), FSMONITOR__IPC_THREADS, i); @@ -49,7 +49,7 @@ static int fsmonitor_config(const char *var, const char *value, } if (!strcmp(var, FSMONITOR__START_TIMEOUT)) { - int i = git_config_int(var, value); + int i = git_config_int(var, value, kvi); if (i < 0) return error(_("value of '%s' out of range: %d"), FSMONITOR__START_TIMEOUT, i); @@ -59,7 +59,7 @@ static int fsmonitor_config(const char *var, const char *value, if (!strcmp(var, FSMONITOR__ANNOUNCE_STARTUP)) { int is_bool; - int i = git_config_bool_or_int(var, value, &is_bool); + int i = git_config_bool_or_int(var, value, kvi, &is_bool); if (i < 0) return error(_("value of '%s' not bool or int: %d"), var, i); diff --git a/builtin/grep.c b/builtin/grep.c index 6e795f9f3a2..edb57f048ef 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -298,7 +298,7 @@ static int grep_cmd_config(const char *var, const char *value, st = -1; if (!strcmp(var, "grep.threads")) { - num_threads = git_config_int(var, value); + num_threads = git_config_int(var, value, kvi); if (num_threads < 0) die(_("invalid number of threads specified (%d) for %s"), num_threads, var); diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 4450510ddfc..e7685fa9a6f 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1584,13 +1584,13 @@ static int git_index_pack_config(const char *k, const char *v, struct pack_idx_option *opts = cb; if (!strcmp(k, "pack.indexversion")) { - opts->version = git_config_int(k, v); + opts->version = git_config_int(k, v, kvi); if (opts->version > 2) die(_("bad pack.indexVersion=%"PRIu32), opts->version); return 0; } if (!strcmp(k, "pack.threads")) { - nr_threads = git_config_int(k, v); + nr_threads = git_config_int(k, v, kvi); if (nr_threads < 0) die(_("invalid number of threads specified (%d)"), nr_threads); diff --git a/builtin/log.c b/builtin/log.c index f8e61330491..805320a1abf 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -569,7 +569,7 @@ static int git_log_config(const char *var, const char *value, if (!strcmp(var, "format.subjectprefix")) return git_config_string(&fmt_patch_subject_prefix, var, value); if (!strcmp(var, "format.filenamemaxlength")) { - fmt_patch_name_max = git_config_int(var, value); + fmt_patch_name_max = git_config_int(var, value, kvi); return 0; } if (!strcmp(var, "format.encodeemailheaders")) { diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ca023000cc0..cde11f83f81 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3138,23 +3138,23 @@ static int git_pack_config(const char *k, const char *v, struct key_value_info *kvi, void *cb) { if (!strcmp(k, "pack.window")) { - window = git_config_int(k, v); + window = git_config_int(k, v, kvi); return 0; } if (!strcmp(k, "pack.windowmemory")) { - window_memory_limit = git_config_ulong(k, v); + window_memory_limit = git_config_ulong(k, v, kvi); return 0; } if (!strcmp(k, "pack.depth")) { - depth = git_config_int(k, v); + depth = git_config_int(k, v, kvi); return 0; } if (!strcmp(k, "pack.deltacachesize")) { - max_delta_cache_size = git_config_int(k, v); + max_delta_cache_size = git_config_int(k, v, kvi); return 0; } if (!strcmp(k, "pack.deltacachelimit")) { - cache_max_small_delta_size = git_config_int(k, v); + cache_max_small_delta_size = git_config_int(k, v, kvi); return 0; } if (!strcmp(k, "pack.writebitmaphashcache")) { @@ -3180,7 +3180,7 @@ static int git_pack_config(const char *k, const char *v, return 0; } if (!strcmp(k, "pack.threads")) { - delta_search_threads = git_config_int(k, v); + delta_search_threads = git_config_int(k, v, kvi); if (delta_search_threads < 0) die(_("invalid number of threads specified (%d)"), delta_search_threads); @@ -3191,7 +3191,7 @@ static int git_pack_config(const char *k, const char *v, return 0; } if (!strcmp(k, "pack.indexversion")) { - pack_idx_opts.version = git_config_int(k, v); + pack_idx_opts.version = git_config_int(k, v, kvi); if (pack_idx_opts.version > 2) die(_("bad pack.indexVersion=%"PRIu32), pack_idx_opts.version); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 2f5fd2abbc3..d2bc0fead9f 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -154,12 +154,12 @@ static int receive_pack_config(const char *var, const char *value, } if (strcmp(var, "receive.unpacklimit") == 0) { - receive_unpack_limit = git_config_int(var, value); + receive_unpack_limit = git_config_int(var, value, kvi); return 0; } if (strcmp(var, "transfer.unpacklimit") == 0) { - transfer_unpack_limit = git_config_int(var, value); + transfer_unpack_limit = git_config_int(var, value, kvi); return 0; } @@ -227,7 +227,7 @@ static int receive_pack_config(const char *var, const char *value, return git_config_string(&cert_nonce_seed, var, value); if (strcmp(var, "receive.certnonceslop") == 0) { - nonce_stamp_slop_limit = git_config_ulong(var, value); + nonce_stamp_slop_limit = git_config_ulong(var, value, kvi); return 0; } @@ -242,12 +242,12 @@ static int receive_pack_config(const char *var, const char *value, } if (strcmp(var, "receive.keepalive") == 0) { - keepalive_in_sec = git_config_int(var, value); + keepalive_in_sec = git_config_int(var, value, kvi); return 0; } if (strcmp(var, "receive.maxinputsize") == 0) { - max_input_size = git_config_int64(var, value); + max_input_size = git_config_int64(var, value, kvi); return 0; } diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 8570effbf0d..bda10764db5 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2187,13 +2187,13 @@ static int update_clone_task_finished(int result, } static int git_update_clone_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, + struct key_value_info *kvi, void *cb) { int *max_jobs = cb; if (!strcmp(var, "submodule.fetchjobs")) - *max_jobs = parse_submodule_fetchjobs(var, value); + *max_jobs = parse_submodule_fetchjobs(var, value, kvi); return 0; } diff --git a/config.c b/config.c index 819e9e5966c..34a111b2e1c 100644 --- a/config.c +++ b/config.c @@ -66,18 +66,8 @@ struct config_reader { * * The "source" variable will be non-NULL only when we are actually * parsing a real config source (file, blob, cmdline, etc). - * - * The "config_kvi" variable will be non-NULL only when we are feeding - * cached config from a configset into a callback. - * - * They cannot be non-NULL at the same time. If they are both NULL, then - * we aren't parsing anything (and depending on the function looking at - * the variables, it's either a bug for it to be called in the first - * place, or it's a function which can be reused for non-config - * purposes, and should fall back to some sane behavior). */ struct config_source *source; - struct key_value_info *config_kvi; }; /* * Where possible, prefer to accept "struct config_reader" as an arg than to use @@ -89,8 +79,6 @@ static struct config_reader the_reader; static inline void config_reader_push_source(struct config_reader *reader, struct config_source *top) { - if (reader->config_kvi) - BUG("source should not be set while iterating a config set"); top->prev = reader->source; reader->source = top; } @@ -105,12 +93,6 @@ static inline struct config_source *config_reader_pop_source(struct config_reade return ret; } -static inline void config_reader_set_kvi(struct config_reader *reader, - struct key_value_info *kvi) -{ - reader->config_kvi = kvi; -} - static int pack_compression_seen; static int zlib_compression_seen; @@ -1330,80 +1312,74 @@ int git_parse_ssize_t(const char *value, ssize_t *ret) return 1; } -static int reader_config_name(struct config_reader *reader, const char **out); -static int reader_origin_type(struct config_reader *reader, - enum config_origin_type *type); NORETURN -static void die_bad_number(struct config_reader *reader, const char *name, - const char *value) +static void die_bad_number(const char *name, const char *value, + struct key_value_info *kvi) { const char *error_type = (errno == ERANGE) ? N_("out of range") : N_("invalid unit"); const char *bad_numeric = N_("bad numeric config value '%s' for '%s': %s"); - const char *config_name = NULL; - enum config_origin_type config_origin = CONFIG_ORIGIN_UNKNOWN; if (!value) value = ""; - /* Ignoring the return value is okay since we handle missing values. */ - reader_config_name(reader, &config_name); - reader_origin_type(reader, &config_origin); - - if (!config_name) + if (!kvi || !kvi->filename) die(_(bad_numeric), value, name, _(error_type)); - switch (config_origin) { + switch (kvi->origin_type) { case CONFIG_ORIGIN_BLOB: die(_("bad numeric config value '%s' for '%s' in blob %s: %s"), - value, name, config_name, _(error_type)); + value, name, kvi->filename, _(error_type)); case CONFIG_ORIGIN_FILE: die(_("bad numeric config value '%s' for '%s' in file %s: %s"), - value, name, config_name, _(error_type)); + value, name, kvi->filename, _(error_type)); case CONFIG_ORIGIN_STDIN: die(_("bad numeric config value '%s' for '%s' in standard input: %s"), value, name, _(error_type)); case CONFIG_ORIGIN_SUBMODULE_BLOB: die(_("bad numeric config value '%s' for '%s' in submodule-blob %s: %s"), - value, name, config_name, _(error_type)); + value, name, kvi->filename, _(error_type)); case CONFIG_ORIGIN_CMDLINE: die(_("bad numeric config value '%s' for '%s' in command line %s: %s"), - value, name, config_name, _(error_type)); + value, name, kvi->filename, _(error_type)); default: die(_("bad numeric config value '%s' for '%s' in %s: %s"), - value, name, config_name, _(error_type)); + value, name, kvi->filename, _(error_type)); } } -int git_config_int(const char *name, const char *value) +int git_config_int(const char *name, const char *value, + struct key_value_info *kvi) { int ret; if (!git_parse_int(value, &ret)) - die_bad_number(&the_reader, name, value); + die_bad_number(name, value, kvi); return ret; } -int64_t git_config_int64(const char *name, const char *value) +int64_t git_config_int64(const char *name, const char *value, struct key_value_info *kvi) { int64_t ret; if (!git_parse_int64(value, &ret)) - die_bad_number(&the_reader, name, value); + die_bad_number(name, value, kvi); return ret; } -unsigned long git_config_ulong(const char *name, const char *value) +unsigned long git_config_ulong(const char *name, const char *value, + struct key_value_info *kvi) { unsigned long ret; if (!git_parse_ulong(value, &ret)) - die_bad_number(&the_reader, name, value); + die_bad_number(name, value, kvi); return ret; } -ssize_t git_config_ssize_t(const char *name, const char *value) +ssize_t git_config_ssize_t(const char *name, const char *value, + struct key_value_info *kvi) { ssize_t ret; if (!git_parse_ssize_t(value, &ret)) - die_bad_number(&the_reader, name, value); + die_bad_number(name, value, kvi); return ret; } @@ -1508,7 +1484,8 @@ int git_parse_maybe_bool(const char *value) return -1; } -int git_config_bool_or_int(const char *name, const char *value, int *is_bool) +int git_config_bool_or_int(const char *name, const char *value, + struct key_value_info *kvi, int *is_bool) { int v = git_parse_maybe_bool_text(value); if (0 <= v) { @@ -1516,7 +1493,7 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool) return v; } *is_bool = 0; - return git_config_int(name, value); + return git_config_int(name, value, kvi); } int git_config_bool(const char *name, const char *value) @@ -1642,7 +1619,7 @@ static int git_default_core_config(const char *var, const char *value, else if (!git_parse_maybe_bool_text(value)) default_abbrev = the_hash_algo->hexsz; else { - int abbrev = git_config_int(var, value); + int abbrev = git_config_int(var, value, kvi); if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz) return error(_("abbrev length out of range: %d"), abbrev); default_abbrev = abbrev; @@ -1654,7 +1631,7 @@ static int git_default_core_config(const char *var, const char *value, return set_disambiguate_hint_config(var, value); if (!strcmp(var, "core.loosecompression")) { - int level = git_config_int(var, value); + int level = git_config_int(var, value, kvi); if (level == -1) level = Z_DEFAULT_COMPRESSION; else if (level < 0 || level > Z_BEST_COMPRESSION) @@ -1665,7 +1642,7 @@ static int git_default_core_config(const char *var, const char *value, } if (!strcmp(var, "core.compression")) { - int level = git_config_int(var, value); + int level = git_config_int(var, value, kvi); if (level == -1) level = Z_DEFAULT_COMPRESSION; else if (level < 0 || level > Z_BEST_COMPRESSION) @@ -1679,7 +1656,7 @@ static int git_default_core_config(const char *var, const char *value, if (!strcmp(var, "core.packedgitwindowsize")) { int pgsz_x2 = getpagesize() * 2; - packed_git_window_size = git_config_ulong(var, value); + packed_git_window_size = git_config_ulong(var, value, kvi); /* This value must be multiple of (pagesize * 2) */ packed_git_window_size /= pgsz_x2; @@ -1690,17 +1667,17 @@ static int git_default_core_config(const char *var, const char *value, } if (!strcmp(var, "core.bigfilethreshold")) { - big_file_threshold = git_config_ulong(var, value); + big_file_threshold = git_config_ulong(var, value, kvi); return 0; } if (!strcmp(var, "core.packedgitlimit")) { - packed_git_limit = git_config_ulong(var, value); + packed_git_limit = git_config_ulong(var, value, kvi); return 0; } if (!strcmp(var, "core.deltabasecachelimit")) { - delta_base_cache_limit = git_config_ulong(var, value); + delta_base_cache_limit = git_config_ulong(var, value, kvi); return 0; } @@ -1984,12 +1961,12 @@ int git_default_config(const char *var, const char *value, } if (!strcmp(var, "pack.packsizelimit")) { - pack_size_limit_cfg = git_config_ulong(var, value); + pack_size_limit_cfg = git_config_ulong(var, value, kvi); return 0; } if (!strcmp(var, "pack.compression")) { - int level = git_config_int(var, value); + int level = git_config_int(var, value, kvi); if (level == -1) level = Z_DEFAULT_COMPRESSION; else if (level < 0 || level > Z_BEST_COMPRESSION) @@ -2323,11 +2300,8 @@ static void configset_iter(struct config_reader *reader, struct config_set *set, values = &entry->value_list; kvi = values->items[value_index].util; - config_reader_set_kvi(reader, values->items[value_index].util); - if (fn(entry->key, values->items[value_index].string, kvi, data) < 0) git_die_config_linenr(entry->key, kvi->filename, kvi->linenr); - config_reader_set_kvi(reader, NULL); } } @@ -2509,11 +2483,12 @@ int git_configset_add_file(struct config_set *set, const char *filename) return git_config_from_file(config_set_callback, filename, &data); } -int git_configset_get_value(struct config_set *set, const char *key, const char **value) +int git_configset_get_value(struct config_set *set, const char *key, + const char **value, struct key_value_info *kvi) { const struct string_list *values = NULL; int ret; - + struct string_list_item item; /* * Follows "last one wins" semantic, i.e., if there are multiple matches for the * queried key in the files of the configset, the value returned will be the last @@ -2523,7 +2498,10 @@ int git_configset_get_value(struct config_set *set, const char *key, const char return ret; assert(values->nr > 0); - *value = values->items[values->nr - 1].string; + item = values->items[values->nr - 1]; + *value = item.string; + if (kvi) + *kvi = *((struct key_value_info *)item.util); return 0; } @@ -2576,7 +2554,7 @@ int git_configset_get(struct config_set *set, const char *key) int git_configset_get_string(struct config_set *set, const char *key, char **dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) + if (!git_configset_get_value(set, key, &value, NULL)) return git_config_string((const char **)dest, key, value); else return 1; @@ -2586,7 +2564,7 @@ static int git_configset_get_string_tmp(struct config_set *set, const char *key, const char **dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) { + if (!git_configset_get_value(set, key, &value, NULL)) { if (!value) return config_error_nonbool(key); *dest = value; @@ -2599,8 +2577,10 @@ static int git_configset_get_string_tmp(struct config_set *set, const char *key, int git_configset_get_int(struct config_set *set, const char *key, int *dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) { - *dest = git_config_int(key, value); + struct key_value_info kvi; + + if (!git_configset_get_value(set, key, &value, &kvi)) { + *dest = git_config_int(key, value, &kvi); return 0; } else return 1; @@ -2609,8 +2589,10 @@ int git_configset_get_int(struct config_set *set, const char *key, int *dest) int git_configset_get_ulong(struct config_set *set, const char *key, unsigned long *dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) { - *dest = git_config_ulong(key, value); + struct key_value_info kvi; + + if (!git_configset_get_value(set, key, &value, &kvi)) { + *dest = git_config_ulong(key, value, &kvi); return 0; } else return 1; @@ -2619,7 +2601,7 @@ int git_configset_get_ulong(struct config_set *set, const char *key, unsigned lo int git_configset_get_bool(struct config_set *set, const char *key, int *dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) { + if (!git_configset_get_value(set, key, &value, NULL)) { *dest = git_config_bool(key, value); return 0; } else @@ -2630,8 +2612,10 @@ int git_configset_get_bool_or_int(struct config_set *set, const char *key, int *is_bool, int *dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) { - *dest = git_config_bool_or_int(key, value, is_bool); + struct key_value_info kvi; + + if (!git_configset_get_value(set, key, &value, &kvi)) { + *dest = git_config_bool_or_int(key, value, &kvi, is_bool); return 0; } else return 1; @@ -2640,7 +2624,7 @@ int git_configset_get_bool_or_int(struct config_set *set, const char *key, int git_configset_get_maybe_bool(struct config_set *set, const char *key, int *dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) { + if (!git_configset_get_value(set, key, &value, NULL)) { *dest = git_parse_maybe_bool(value); if (*dest == -1) return -1; @@ -2652,7 +2636,7 @@ int git_configset_get_maybe_bool(struct config_set *set, const char *key, int *d int git_configset_get_pathname(struct config_set *set, const char *key, const char **dest) { const char *value; - if (!git_configset_get_value(set, key, &value)) + if (!git_configset_get_value(set, key, &value, NULL)) return git_config_pathname(dest, key, value); else return 1; @@ -2722,7 +2706,7 @@ int repo_config_get_value(struct repository *repo, const char *key, const char **value) { git_config_check_init(repo); - return git_configset_get_value(repo->config, key, value); + return git_configset_get_value(repo->config, key, value, NULL); } int repo_config_get_value_multi(struct repository *repo, const char *key, @@ -3946,18 +3930,6 @@ int parse_config_key(const char *var, return 0; } -static int reader_origin_type(struct config_reader *reader, - enum config_origin_type *type) -{ - if (the_reader.config_kvi) - *type = reader->config_kvi->origin_type; - else if(the_reader.source) - *type = reader->source->origin_type; - else - return 1; - return 0; -} - const char *config_origin_type_name(enum config_origin_type type) { switch (type) { @@ -3996,17 +3968,6 @@ const char *config_scope_name(enum config_scope scope) } } -static int reader_config_name(struct config_reader *reader, const char **out) -{ - if (the_reader.config_kvi) - *out = reader->config_kvi->filename; - else if (the_reader.source) - *out = reader->source->name; - else - return 1; - return 0; -} - int lookup_config(const char **mapping, int nr_mapping, const char *var) { int i; diff --git a/config.h b/config.h index 9e3c2bdb429..0fe56a4d650 100644 --- a/config.h +++ b/config.h @@ -229,22 +229,23 @@ int git_parse_maybe_bool(const char *); * Parse the string to an integer, including unit factors. Dies on error; * otherwise, returns the parsed result. */ -int git_config_int(const char *, const char *); +int git_config_int(const char *, const char *, struct key_value_info *); -int64_t git_config_int64(const char *, const char *); +int64_t git_config_int64(const char *, const char *, struct key_value_info *); /** * Identical to `git_config_int`, but for unsigned longs. */ -unsigned long git_config_ulong(const char *, const char *); +unsigned long git_config_ulong(const char *, const char *, struct key_value_info *); -ssize_t git_config_ssize_t(const char *, const char *); +ssize_t git_config_ssize_t(const char *, const char *, struct key_value_info *); /** * Same as `git_config_bool`, except that integers are returned as-is, and * an `is_bool` flag is unset. */ -int git_config_bool_or_int(const char *, const char *, int *); +int git_config_bool_or_int(const char *, const char *, struct key_value_info *, + int *); /** * Parse a string into a boolean value, respecting keywords like "true" and @@ -509,7 +510,8 @@ int git_configset_get(struct config_set *cs, const char *key); * touching `value`. The caller should not free or modify `value`, as it * is owned by the cache. */ -int git_configset_get_value(struct config_set *cs, const char *key, const char **dest); +int git_configset_get_value(struct config_set *cs, const char *key, + const char **dest, struct key_value_info *kvi); int git_configset_get_string(struct config_set *cs, const char *key, char **dest); int git_configset_get_int(struct config_set *cs, const char *key, int *dest); diff --git a/contrib/coccinelle/git_config_number.cocci b/contrib/coccinelle/git_config_number.cocci new file mode 100644 index 00000000000..f46c74dd23c --- /dev/null +++ b/contrib/coccinelle/git_config_number.cocci @@ -0,0 +1,27 @@ +@@ +identifier C1, C2, C3; +@@ +( +( +git_config_int +| +git_config_int64 +| +git_config_ulong +| +git_config_ssize_t +) + (C1, C2 ++ , kvi + ) +| +( +git_configset_get_value +| +git_config_bool_or_int +) + (C1, C2, ++ kvi, + C3 + ) +) diff --git a/diff.c b/diff.c index d7ed2dc900b..da7cd353a6d 100644 --- a/diff.c +++ b/diff.c @@ -372,13 +372,14 @@ int git_diff_ui_config(const char *var, const char *value, return 0; } if (!strcmp(var, "diff.context")) { - diff_context_default = git_config_int(var, value); + diff_context_default = git_config_int(var, value, kvi); if (diff_context_default < 0) return -1; return 0; } if (!strcmp(var, "diff.interhunkcontext")) { - diff_interhunk_context_default = git_config_int(var, value); + diff_interhunk_context_default = git_config_int(var, value, + kvi); if (diff_interhunk_context_default < 0) return -1; return 0; @@ -404,7 +405,7 @@ int git_diff_ui_config(const char *var, const char *value, return 0; } if (!strcmp(var, "diff.statgraphwidth")) { - diff_stat_graph_width = git_config_int(var, value); + diff_stat_graph_width = git_config_int(var, value, kvi); return 0; } if (!strcmp(var, "diff.external")) @@ -443,7 +444,7 @@ int git_diff_basic_config(const char *var, const char *value, const char *name; if (!strcmp(var, "diff.renamelimit")) { - diff_rename_limit_default = git_config_int(var, value); + diff_rename_limit_default = git_config_int(var, value, kvi); return 0; } diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 97358034fa0..d1b59af44bb 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -24,7 +24,7 @@ int fmt_merge_msg_config(const char *key, const char *value, { if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { int is_bool; - merge_log_config = git_config_bool_or_int(key, value, &is_bool); + merge_log_config = git_config_bool_or_int(key, value, kvi, &is_bool); if (!is_bool && merge_log_config < 0) return error("%s: negative length %s", key, value); if (is_bool && merge_log_config) diff --git a/help.c b/help.c index 43d1eb702cd..08f0b953736 100644 --- a/help.c +++ b/help.c @@ -545,8 +545,7 @@ static struct cmdnames aliases; #define AUTOCORRECT_IMMEDIATELY (-1) static int git_unknown_cmd_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, - void *cb UNUSED) + struct key_value_info *kvi, void *cb UNUSED) { const char *p; @@ -560,7 +559,7 @@ static int git_unknown_cmd_config(const char *var, const char *value, } else if (!strcmp(value, "prompt")) { autocorrect = AUTOCORRECT_PROMPT; } else { - int v = git_config_int(var, value); + int v = git_config_int(var, value, kvi); autocorrect = (v < 0) ? AUTOCORRECT_IMMEDIATELY : v; } diff --git a/http.c b/http.c index 3d4292eba6a..a26c3dff827 100644 --- a/http.c +++ b/http.c @@ -412,21 +412,21 @@ static int http_options(const char *var, const char *value, } if (!strcmp("http.minsessions", var)) { - min_curl_sessions = git_config_int(var, value); + min_curl_sessions = git_config_int(var, value, kvi); if (min_curl_sessions > 1) min_curl_sessions = 1; return 0; } if (!strcmp("http.maxrequests", var)) { - max_requests = git_config_int(var, value); + max_requests = git_config_int(var, value, kvi); return 0; } if (!strcmp("http.lowspeedlimit", var)) { - curl_low_speed_limit = (long)git_config_int(var, value); + curl_low_speed_limit = (long)git_config_int(var, value, kvi); return 0; } if (!strcmp("http.lowspeedtime", var)) { - curl_low_speed_time = (long)git_config_int(var, value); + curl_low_speed_time = (long)git_config_int(var, value, kvi); return 0; } @@ -462,7 +462,7 @@ static int http_options(const char *var, const char *value, } if (!strcmp("http.postbuffer", var)) { - http_post_buffer = git_config_ssize_t(var, value); + http_post_buffer = git_config_ssize_t(var, value, kvi); if (http_post_buffer < 0) warning(_("negative value for http.postBuffer; defaulting to %d"), LARGE_PACKET_MAX); if (http_post_buffer < LARGE_PACKET_MAX) diff --git a/imap-send.c b/imap-send.c index 3cc98f1a0a5..3c391a52c5a 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1341,7 +1341,7 @@ static int git_imap_config(const char *var, const char *val, else if (!strcmp("imap.authmethod", var)) return git_config_string(&server.auth_method, var, val); else if (!strcmp("imap.port", var)) - server.port = git_config_int(var, val); + server.port = git_config_int(var, val, kvi); else if (!strcmp("imap.host", var)) { if (!val) { git_die_config("imap.host", "Missing value for 'imap.host'"); diff --git a/sequencer.c b/sequencer.c index 171561c2cdb..76b4750b4bd 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2878,7 +2878,7 @@ static int git_config_string_dup(char **dest, } static int populate_opts_cb(const char *key, const char *value, - struct key_value_info *kvi UNUSED, void *data) + struct key_value_info *kvi, void *data) { struct replay_opts *opts = data; int error_flag = 1; @@ -2886,26 +2886,26 @@ static int populate_opts_cb(const char *key, const char *value, if (!value) error_flag = 0; else if (!strcmp(key, "options.no-commit")) - opts->no_commit = git_config_bool_or_int(key, value, &error_flag); + opts->no_commit = git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.edit")) - opts->edit = git_config_bool_or_int(key, value, &error_flag); + opts->edit = git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.allow-empty")) opts->allow_empty = - git_config_bool_or_int(key, value, &error_flag); + git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.allow-empty-message")) opts->allow_empty_message = - git_config_bool_or_int(key, value, &error_flag); + git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.keep-redundant-commits")) opts->keep_redundant_commits = - git_config_bool_or_int(key, value, &error_flag); + git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.signoff")) - opts->signoff = git_config_bool_or_int(key, value, &error_flag); + opts->signoff = git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.record-origin")) - opts->record_origin = git_config_bool_or_int(key, value, &error_flag); + opts->record_origin = git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.allow-ff")) - opts->allow_ff = git_config_bool_or_int(key, value, &error_flag); + opts->allow_ff = git_config_bool_or_int(key, value, kvi, &error_flag); else if (!strcmp(key, "options.mainline")) - opts->mainline = git_config_int(key, value); + opts->mainline = git_config_int(key, value, kvi); else if (!strcmp(key, "options.strategy")) git_config_string_dup(&opts->strategy, key, value); else if (!strcmp(key, "options.gpg-sign")) @@ -2915,7 +2915,7 @@ static int populate_opts_cb(const char *key, const char *value, opts->xopts[opts->xopts_nr++] = xstrdup(value); } else if (!strcmp(key, "options.allow-rerere-auto")) opts->allow_rerere_auto = - git_config_bool_or_int(key, value, &error_flag) ? + git_config_bool_or_int(key, value, kvi, &error_flag) ? RERERE_AUTOUPDATE : RERERE_NOAUTOUPDATE; else if (!strcmp(key, "options.default-msg-cleanup")) { opts->explicit_cleanup = 1; diff --git a/setup.c b/setup.c index a461dd15233..75934d7438f 100644 --- a/setup.c +++ b/setup.c @@ -594,7 +594,7 @@ static int check_repo_format(const char *var, const char *value, const char *ext; if (strcmp(var, "core.repositoryformatversion") == 0) - data->version = git_config_int(var, value); + data->version = git_config_int(var, value, kvi); else if (skip_prefix(var, "extensions.", &ext)) { switch (handle_extension_v0(var, value, ext, data)) { case EXTENSION_ERROR: diff --git a/submodule-config.c b/submodule-config.c index 7d773f33621..b86547fd1ee 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -302,9 +302,10 @@ static int parse_fetch_recurse(const char *opt, const char *arg, } } -int parse_submodule_fetchjobs(const char *var, const char *value) +int parse_submodule_fetchjobs(const char *var, const char *value, + struct key_value_info *kvi) { - int fetchjobs = git_config_int(var, value); + int fetchjobs = git_config_int(var, value, kvi); if (fetchjobs < 0) die(_("negative values not allowed for submodule.fetchJobs")); if (!fetchjobs) @@ -848,14 +849,13 @@ struct fetch_config { }; static int gitmodules_fetch_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, - void *cb) + struct key_value_info *kvi, void *cb) { struct fetch_config *config = cb; if (!strcmp(var, "submodule.fetchjobs")) { if (config->max_children) *(config->max_children) = - parse_submodule_fetchjobs(var, value); + parse_submodule_fetchjobs(var, value, kvi); return 0; } else if (!strcmp(var, "fetch.recursesubmodules")) { if (config->recurse_submodules) @@ -877,12 +877,11 @@ void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules) } static int gitmodules_update_clone_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, - void *cb) + struct key_value_info *kvi, void *cb) { int *max_jobs = cb; if (!strcmp(var, "submodule.fetchjobs")) - *max_jobs = parse_submodule_fetchjobs(var, value); + *max_jobs = parse_submodule_fetchjobs(var, value, kvi); return 0; } diff --git a/submodule-config.h b/submodule-config.h index c2045875bbb..944cae75cc9 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -50,7 +50,8 @@ struct repository; void submodule_cache_free(struct submodule_cache *cache); -int parse_submodule_fetchjobs(const char *var, const char *value); +int parse_submodule_fetchjobs(const char *var, const char *value, + struct key_value_info *kvi); int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); struct option; int option_fetch_parse_recurse_submodules(const struct option *opt, diff --git a/t/helper/test-config.c b/t/helper/test-config.c index 7027ffa187f..737505583d4 100644 --- a/t/helper/test-config.c +++ b/t/helper/test-config.c @@ -61,12 +61,12 @@ static int iterate_cb(const char *var, const char *value, } static int parse_int_cb(const char *var, const char *value, - struct key_value_info *kvi UNUSED, void *data) + struct key_value_info *kvi, void *data) { const char *key_to_match = data; if (!strcmp(key_to_match, var)) { - int parsed = git_config_int(value, value); + int parsed = git_config_int(value, value, kvi); printf("%d\n", parsed); } return 0; @@ -179,7 +179,7 @@ int cmd__config(int argc, const char **argv) goto exit2; } } - if (!git_configset_get_value(&cs, argv[2], &v)) { + if (!git_configset_get_value(&cs, argv[2], &v, NULL)) { if (!v) printf("(NULL)\n"); else diff --git a/upload-pack.c b/upload-pack.c index 5f8232ff078..7cf776cde91 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1264,7 +1264,8 @@ static int find_symref(const char *refname, } static int parse_object_filter_config(const char *var, const char *value, - struct upload_pack_data *data) + struct key_value_info *kvi, + struct upload_pack_data *data) { struct strbuf buf = STRBUF_INIT; const char *sub, *key; @@ -1291,7 +1292,8 @@ static int parse_object_filter_config(const char *var, const char *value, } string_list_insert(&data->allowed_filters, buf.buf)->util = (void *)(intptr_t)1; - data->tree_filter_max_depth = git_config_ulong(var, value); + data->tree_filter_max_depth = git_config_ulong(var, value, + kvi); } strbuf_release(&buf); @@ -1299,7 +1301,7 @@ static int parse_object_filter_config(const char *var, const char *value, } static int upload_pack_config(const char *var, const char *value, - struct key_value_info *kvi UNUSED, + struct key_value_info *kvi, void *cb_data) { struct upload_pack_data *data = cb_data; @@ -1320,7 +1322,7 @@ static int upload_pack_config(const char *var, const char *value, else data->allow_uor &= ~ALLOW_ANY_SHA1; } else if (!strcmp("uploadpack.keepalive", var)) { - data->keepalive = git_config_int(var, value); + data->keepalive = git_config_int(var, value, kvi); if (!data->keepalive) data->keepalive = -1; } else if (!strcmp("uploadpack.allowfilter", var)) { @@ -1335,7 +1337,7 @@ static int upload_pack_config(const char *var, const char *value, data->advertise_sid = git_config_bool(var, value); } - if (parse_object_filter_config(var, value, data) < 0) + if (parse_object_filter_config(var, value, kvi, data) < 0) return -1; return parse_hide_refs_config(var, value, "uploadpack", &data->hidden_refs); diff --git a/worktree.c b/worktree.c index b5ee71c5ebd..1fbdbd745fb 100644 --- a/worktree.c +++ b/worktree.c @@ -835,7 +835,7 @@ int init_worktree_config(struct repository *r) * Relocate that value to avoid breaking all worktrees with this * upgrade to worktree config. */ - if (!git_configset_get_value(&cs, "core.worktree", &core_worktree)) { + if (!git_configset_get_value(&cs, "core.worktree", &core_worktree, NULL)) { if ((res = move_config_setting("core.worktree", core_worktree, common_config_file, main_worktree_file))) From patchwork Tue May 30 18:42:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A685DC77B7A for ; Tue, 30 May 2023 18:43:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233514AbjE3SnI (ORCPT ); Tue, 30 May 2023 14:43:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232890AbjE3Sme (ORCPT ); Tue, 30 May 2023 14:42:34 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 484A111B for ; Tue, 30 May 2023 11:42:28 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-30a1fdde3d6so4864191f8f.0 for ; Tue, 30 May 2023 11:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472146; x=1688064146; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=FStdSaKaUJJlzPIwzZ5jL3eYjO9dGulT31OgN6r0Grw=; b=Cua2kZQQFxCcJfzf/FnBwBP3APX0ckSVLINa+ajgZ1VQHejtUVA+5WECD7SoygxW6e 4giAXLcl8kJZlSiBvcAVKu0GXFjGXwdco+B/haweX1LPVWHuRh0nZ6IvX/GWEjQDMCYY VnZ284TluIJufE7qxHDtKeaQ5YWq/jwAAeMzh95H/ijUGt9c5pxTM93Fq3EInSmA+P1Y iOjLSEZLj75Rx1YYozcf73CuUDXQ5z4yuAfEDzFhDCrGUdHt6STuNM3TIGWql4iLme+A ZxFgqLKNbrejeOAIoM4XVMEciHv08Vi1IsfOeTkAAY7gm8d/SdXht9WeBQIKq7kIFBjB gc9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472146; x=1688064146; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FStdSaKaUJJlzPIwzZ5jL3eYjO9dGulT31OgN6r0Grw=; b=YQDoPPqCpXay8/v6loZQtjjB+CelRO8guwt4Eip1BNA6X1G29YQfzzoy3ZB/M7Zc5m yFOL4BQTcLQ+rewVyeVaWvKqjwWMNXq0x/OKLDRw8Sbbte7FVE0a4rpJx2XGaPrk/6d4 CkzmN8pTiNkLHrhsQusQ5+OlYxSfjg5M1cv/MnU+VYGHWhjVG7tAe1/gAYr//pDirZHi V6VXGWdPuI1gdbcCWPsl02gQrmmbYGMfLvPrJVvJpfNN51QmMse8nOJlNJWy2NTk32kN ltjJCCm8ikE7+QW3Rqpy+9B3uUBkgifXS7x+h0yQf/XZQBig9Q6TMtUdMi3Yvs2GyHJt Wopg== X-Gm-Message-State: AC+VfDwEty40H7N6bOhpkNGSA7mvyKUL0zfO/wbvpW6A1mjleBe+rAHc VXlHzRqEjlyOGtoLUINsPiz00hg63YY= X-Google-Smtp-Source: ACHHUZ4nmnRWMpvKtg985+srLZI0bDKBcmQUQpJC5LmDsfo7D6MniNpxTqW6wbshE2jxPpKTmrQdQQ== X-Received: by 2002:adf:dc84:0:b0:307:9702:dfc8 with SMTP id r4-20020adfdc84000000b003079702dfc8mr2275209wrj.48.1685472146191; Tue, 30 May 2023 11:42:26 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t13-20020a5d690d000000b003062675d4c9sm4073690wru.39.2023.05.30.11.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:25 -0700 (PDT) Message-Id: <52db0d3be828e9a410bd3535419d756ecc247c33.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:10 +0000 Subject: [PATCH v2 12/14] config.c: remove config_reader from configsets Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Remove the last usage of "struct config_reader" from configsets by copying the "kvi" arg instead of recomputing "kvi" from config_reader.source. Since we no longer need to pass both "struct config_reader" and "struct config_set" in a single "void *cb", remove "struct configset_add_data" too. Signed-off-by: Glen Choo --- config.c | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/config.c b/config.c index 34a111b2e1c..4d381f93bcc 100644 --- a/config.c +++ b/config.c @@ -2285,8 +2285,7 @@ int config_with_options(config_fn_t fn, void *data, return ret; } -static void configset_iter(struct config_reader *reader, struct config_set *set, - config_fn_t fn, void *data) +static void configset_iter(struct config_set *set, config_fn_t fn, void *data) { int i, value_index; struct string_list *values; @@ -2378,7 +2377,6 @@ static int configset_find_element(struct config_set *set, const char *key, } static int configset_add_value(struct key_value_info *kvi_p, - struct config_reader *reader, struct config_set *set, const char *key, const char *value) { @@ -2409,11 +2407,7 @@ static int configset_add_value(struct key_value_info *kvi_p, l_item->e = e; l_item->value_index = e->value_list.nr - 1; - if (reader->source->name) { - kvi_from_source(reader->source, kvi_p->scope, kv_info); - } else { - kvi_from_param(kv_info); - } + memcpy(kv_info, kvi_p, sizeof(struct key_value_info)); si->util = kv_info; return 0; @@ -2461,26 +2455,17 @@ void git_configset_clear(struct config_set *set) set->list.items = NULL; } -struct configset_add_data { - struct config_set *config_set; - struct config_reader *config_reader; -}; -#define CONFIGSET_ADD_INIT { 0 } - static int config_set_callback(const char *key, const char *value, struct key_value_info *kvi, void *cb) { - struct configset_add_data *data = cb; - configset_add_value(kvi, data->config_reader, data->config_set, key, value); + struct config_set *set = cb; + configset_add_value(kvi, set, key, value); return 0; } int git_configset_add_file(struct config_set *set, const char *filename) { - struct configset_add_data data = CONFIGSET_ADD_INIT; - data.config_reader = &the_reader; - data.config_set = set; - return git_config_from_file(config_set_callback, filename, &data); + return git_config_from_file(config_set_callback, filename, set); } int git_configset_get_value(struct config_set *set, const char *key, @@ -2646,7 +2631,6 @@ int git_configset_get_pathname(struct config_set *set, const char *key, const ch static void repo_read_config(struct repository *repo) { struct config_options opts = { 0 }; - struct configset_add_data data = CONFIGSET_ADD_INIT; opts.respect_includes = 1; opts.commondir = repo->commondir; @@ -2658,10 +2642,8 @@ static void repo_read_config(struct repository *repo) git_configset_clear(repo->config); git_configset_init(repo->config); - data.config_set = repo->config; - data.config_reader = &the_reader; - - if (config_with_options(config_set_callback, &data, NULL, &opts) < 0) + if (config_with_options(config_set_callback, repo->config, NULL, + &opts) < 0) /* * config_with_options() normally returns only * zero, as most errors are fatal, and @@ -2693,7 +2675,7 @@ static void repo_config_clear(struct repository *repo) void repo_config(struct repository *repo, config_fn_t fn, void *data) { git_config_check_init(repo); - configset_iter(&the_reader, repo->config, fn, data); + configset_iter(repo->config, fn, data); } int repo_config_get(struct repository *repo, const char *key) @@ -2800,19 +2782,16 @@ static void read_protected_config(void) .ignore_worktree = 1, .system_gently = 1, }; - struct configset_add_data data = CONFIGSET_ADD_INIT; git_configset_init(&protected_config); - data.config_set = &protected_config; - data.config_reader = &the_reader; - config_with_options(config_set_callback, &data, NULL, &opts); + config_with_options(config_set_callback, &protected_config, NULL, &opts); } void git_protected_config(config_fn_t fn, void *data) { if (!protected_config.hash_initialized) read_protected_config(); - configset_iter(&the_reader, &protected_config, fn, data); + configset_iter(&protected_config, fn, data); } /* Functions used historically to read configuration from 'the_repository' */ From patchwork Tue May 30 18:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D231FC77B7A for ; Tue, 30 May 2023 18:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232890AbjE3SnM (ORCPT ); Tue, 30 May 2023 14:43:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233252AbjE3Smy (ORCPT ); Tue, 30 May 2023 14:42:54 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67F3911D for ; Tue, 30 May 2023 11:42:28 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f6d38a140bso1244695e9.1 for ; Tue, 30 May 2023 11:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472146; x=1688064146; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=MF5NV5oPX8To7OpLDkhXZ2gY6IfeNa5jueQTphspkRQ=; b=BkKsnHXDQf9oZCMpB3tAatRjjc6l9h7JgkHAwMe6Iy23IupOJJJQwakOarMbRn5x8a VP+yGzidJ7vHOBwjZh5/DcteTAyc73qPt5ZGmHJ6egR7ukPJEtqBktVkRahbaFUn0mlF xblrQ9NYevfpCpmSWH7DdCfG3XjfzYbPizg0X6c/B32iMBJ7MFWnxuju6WW1Hmvfs0CN ZIPmTAn7JqSq2vkRl+q9SN/SnYtl3NkUXKPbN5Wy17ErkGQ9teLr3FnMZ9A/6sPNMPks aYWAwV4UaigLCwb1Z6IH1VW2zyPGLF/13//nb770yZIBcE62Wh2hqTFeJNBGWK2Kf2O4 mXTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472146; x=1688064146; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MF5NV5oPX8To7OpLDkhXZ2gY6IfeNa5jueQTphspkRQ=; b=AX5qFiNSDCWTeGcQV6pavypAmzQh1CTXZMqlTwQtIDTwS/xi2dOYQvCguCp55iLlTt ph+i90bHu4xgAZe49CasQKC1teL97C79p9VcjX1JRKyq12TuPfeUeAI/qGnkxcQKM+ny q1cCbxCnuphizSvQmGbBvVCHq8gtZLVFLHi0v3zeiLpSsolnGqzdRF1ZsUUtQvvY8Vw/ NC95BVDMlSuvxEi1+mZZSg6ZT1qJF2kwzhXlUut+Q7Xq3IyjqpV/jm870bXFJHgSK9aj lAM+Wyox6Jlxlzm7qe2CFsKhcOhlMuwh1Dhr4e9rXd9aWS176rD5H7DKSiZBo6qHqvFO MwSA== X-Gm-Message-State: AC+VfDzaLJvNpJHUQ+5550020sH6J88ypX2mkfc+0nN9jUjhvv2skhtk Ky+V9i6N0doiYOftQs0EwEDBvN+PUqg= X-Google-Smtp-Source: ACHHUZ6kvdrTTGVzIu4ThXLo6evQns8lGbIrYz6sfe5HMssqI6F5umIc85JoPyd1YhMOJSMYr/Am4g== X-Received: by 2002:a1c:6a0a:0:b0:3f6:3486:1391 with SMTP id f10-20020a1c6a0a000000b003f634861391mr2574566wmc.13.1685472146673; Tue, 30 May 2023 11:42:26 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c214700b003f4f89bc48dsm21863069wml.15.2023.05.30.11.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:26 -0700 (PDT) Message-Id: <7d9b9eefc7860959dbb6ed86d8c3d165a978a0b5.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:11 +0000 Subject: [PATCH v2 13/14] config: add kvi.path, use it to evaluate includes Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo Include directives are evaluated using the path of the config file. To reduce the dependence on "config_reader.source", add a new "key_value_info.path" member and use that instead of "config_source.path". Signed-off-by: Glen Choo --- config.c | 41 +++++++++++++++++++---------------------- config.h | 1 + 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/config.c b/config.c index 4d381f93bcc..09950b46127 100644 --- a/config.c +++ b/config.c @@ -154,7 +154,6 @@ struct config_include_data { void *data; const struct config_options *opts; struct git_config_source *config_source; - struct config_reader *config_reader; /* * All remote URLs discovered when reading all config files. @@ -173,9 +172,7 @@ static const char include_depth_advice[] = N_( "from\n" " %s\n" "This might be due to circular includes."); -static int handle_path_include(struct config_source *cs, - struct key_value_info *kvi, - const char *path, +static int handle_path_include(struct key_value_info *kvi, const char *path, struct config_include_data *inc) { int ret = 0; @@ -197,14 +194,14 @@ static int handle_path_include(struct config_source *cs, if (!is_absolute_path(path)) { char *slash; - if (!cs || !cs->path) { + if (!kvi || !kvi->path) { ret = error(_("relative config includes must come from files")); goto cleanup; } - slash = find_last_dir_sep(cs->path); + slash = find_last_dir_sep(kvi->path); if (slash) - strbuf_add(&buf, cs->path, slash - cs->path + 1); + strbuf_add(&buf, kvi->path, slash - kvi->path + 1); strbuf_addstr(&buf, path); path = buf.buf; } @@ -212,8 +209,8 @@ static int handle_path_include(struct config_source *cs, if (!access_or_die(path, R_OK, 0)) { if (++inc->depth > MAX_INCLUDE_DEPTH) die(_(include_depth_advice), MAX_INCLUDE_DEPTH, path, - !cs ? "" : - cs->name ? cs->name : + !kvi ? "" : + kvi->filename ? kvi->filename : "the command line"); ret = git_config_from_file_with_options(git_config_include, path, inc, kvi->scope, NULL); @@ -231,7 +228,7 @@ static void add_trailing_starstar_for_dir(struct strbuf *pat) strbuf_addstr(pat, "**"); } -static int prepare_include_condition_pattern(struct config_source *cs, +static int prepare_include_condition_pattern(struct key_value_info *kvi, struct strbuf *pat) { struct strbuf path = STRBUF_INIT; @@ -248,11 +245,11 @@ static int prepare_include_condition_pattern(struct config_source *cs, if (pat->buf[0] == '.' && is_dir_sep(pat->buf[1])) { const char *slash; - if (!cs || !cs->path) + if (!kvi || !kvi->path) return error(_("relative config include " "conditionals must come from files")); - strbuf_realpath(&path, cs->path, 1); + strbuf_realpath(&path, kvi->path, 1); slash = find_last_dir_sep(path.buf); if (!slash) BUG("how is this possible?"); @@ -267,7 +264,7 @@ static int prepare_include_condition_pattern(struct config_source *cs, return prefix; } -static int include_by_gitdir(struct config_source *cs, +static int include_by_gitdir(struct key_value_info *kvi, const struct config_options *opts, const char *cond, size_t cond_len, int icase) { @@ -284,7 +281,7 @@ static int include_by_gitdir(struct config_source *cs, strbuf_realpath(&text, git_dir, 1); strbuf_add(&pattern, cond, cond_len); - prefix = prepare_include_condition_pattern(cs, &pattern); + prefix = prepare_include_condition_pattern(kvi, &pattern); again: if (prefix < 0) @@ -419,16 +416,16 @@ static int include_by_remote_url(struct config_include_data *inc, inc->remote_urls); } -static int include_condition_is_true(struct config_source *cs, +static int include_condition_is_true(struct key_value_info *kvi, struct config_include_data *inc, const char *cond, size_t cond_len) { const struct config_options *opts = inc->opts; if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len)) - return include_by_gitdir(cs, opts, cond, cond_len, 0); + return include_by_gitdir(kvi, opts, cond, cond_len, 0); else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len)) - return include_by_gitdir(cs, opts, cond, cond_len, 1); + return include_by_gitdir(kvi, opts, cond, cond_len, 1); else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len)) return include_by_branch(cond, cond_len); else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond, @@ -443,7 +440,6 @@ static int git_config_include(const char *var, const char *value, struct key_value_info *kvi, void *data) { struct config_include_data *inc = data; - struct config_source *cs = inc->config_reader->source; const char *cond, *key; size_t cond_len; int ret; @@ -457,16 +453,16 @@ static int git_config_include(const char *var, const char *value, return ret; if (!strcmp(var, "include.path")) - ret = handle_path_include(cs, kvi, value, inc); + ret = handle_path_include(kvi, value, inc); if (!parse_config_key(var, "includeif", &cond, &cond_len, &key) && - cond && include_condition_is_true(cs, inc, cond, cond_len) && + cond && include_condition_is_true(kvi, inc, cond, cond_len) && !strcmp(key, "path")) { config_fn_t old_fn = inc->fn; if (inc->opts->unconditional_remote_url) inc->fn = forbid_remote_url; - ret = handle_path_include(cs, kvi, value, inc); + ret = handle_path_include(kvi, value, inc); inc->fn = old_fn; } @@ -648,6 +644,7 @@ void kvi_from_param(struct key_value_info *out) out->linenr = -1; out->origin_type = CONFIG_ORIGIN_CMDLINE; out->scope = CONFIG_SCOPE_COMMAND; + out->path = NULL; } int git_config_parse_parameter(const char *text, @@ -1048,6 +1045,7 @@ static void kvi_from_source(struct config_source *cs, out->origin_type = cs->origin_type; out->linenr = cs->linenr; out->scope = scope; + out->path = cs->path; } static int git_parse_source(struct config_source *cs, config_fn_t fn, @@ -2254,7 +2252,6 @@ int config_with_options(config_fn_t fn, void *data, inc.data = data; inc.opts = opts; inc.config_source = config_source; - inc.config_reader = &the_reader; fn = git_config_include; data = &inc; } diff --git a/config.h b/config.h index 0fe56a4d650..123917d1b0a 100644 --- a/config.h +++ b/config.h @@ -116,6 +116,7 @@ struct key_value_info { int linenr; enum config_origin_type origin_type; enum config_scope scope; + const char *path; }; /** From patchwork Tue May 30 18:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13260977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE7A0C7EE24 for ; Tue, 30 May 2023 18:43:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233468AbjE3SnP (ORCPT ); Tue, 30 May 2023 14:43:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233493AbjE3Smz (ORCPT ); Tue, 30 May 2023 14:42:55 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79280106 for ; Tue, 30 May 2023 11:42:29 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3078a3f3b5fso4801525f8f.0 for ; Tue, 30 May 2023 11:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685472147; x=1688064147; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=niAwLlpaWFr8zmWjPi4PR7Dwkq6Hcs4tAKtgAT3oi5g=; b=E53fDMAk/TX9wznWti1t/IFpaWGgAzrtew/+iQVMptBwoAMcfkyDDpVA1DEkSXSRB9 9IyiKuNYmh+M+i4hUjh0TLUtv5v9W8a+ea4tlHn/PzRDMn5k+jPnATnXtEjGTE1WxvZv 00GwcIDmqXk2nXIwBitWzzpWnywCwtwbs0SurJOJjHu/p9fwYayEdhAbQd1rx8ZqINo3 mPAoxDUM9Ga9UY3hHXp0MNMdgUYTmv6hBnqybYQXqRAjXWxq+THuwSEywFCc0hVixSR1 K4YeVrRiKwO4//dnJdxATGa4d2ywjLJEfGEK+yPn09msfchitkyBkJcV+0Sgy9f+s8en GXlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685472147; x=1688064147; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=niAwLlpaWFr8zmWjPi4PR7Dwkq6Hcs4tAKtgAT3oi5g=; b=MhCPO+6zCeR1R3Vv1jIjKTC/QTrKEDTwqah7bRIAjjov1k9pl+oj1w7XjlbiH9bYeU //FlKAGztt3KdrsMmU7A9XfSZ4aqibjZXmJW4K3o9N889RkjWn6ydA7hYElR4HGStleC r1mpvxM666Ni8v4zEKdlUdNIYWRpvepV16+nPPLkXjhiycXged8Vstt63s63/dY+rTmQ gMy00GwTvJKVp/ThuLFHxJRk0V3GcOhAgM6dGvXgQNyZrJCz109yrX95zgobNFcDjkUh U3ON77Y4a0IvuTjXs/1o+83OLA6as9A9WY7OX5rBls5xhn8twlRISeoV0ZaMtYWbxB9c PpBg== X-Gm-Message-State: AC+VfDwd+dNOWWI23Ou1r0m75tbX2niP/gBoK4kgtmN31WHEWm8EuHDd TKSc+o3+Ulf7kCeodGTI3CNAY4blvf8= X-Google-Smtp-Source: ACHHUZ5gxjphTw9guJYxyDHI/18CHswVfsRMntGVWahiPkNkW26rBb5X2bxv2p54mjuGAondT86eJA== X-Received: by 2002:adf:cf10:0:b0:2f9:8e93:d376 with SMTP id o16-20020adfcf10000000b002f98e93d376mr2358367wrj.56.1685472147356; Tue, 30 May 2023 11:42:27 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b10-20020adfee8a000000b0030aefd11892sm4036518wro.41.2023.05.30.11.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:42:26 -0700 (PDT) Message-Id: <9e35b5b1f4dbdeafca5be7516477dc033b7643a6.1685472134.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 30 May 2023 18:42:12 +0000 Subject: [PATCH v2 14/14] config: pass source to config_parser_event_fn_t Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Emily Shaffer , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo ..so that the callback can use a "struct config_source" parameter instead of "config_reader.source". "struct config_source" is internal to config.c, but this refactor is okay because this function has only ever been (and probably ever will be) used internally by config.c. As a result, the_reader isn't used anywhere, so "struct config_reader" is obsolete (it was only intended to be used with the_reader). Remove them. Signed-off-by: Glen Choo --- config.c | 77 ++++++++++---------------------------------------------- config.h | 6 +++++ 2 files changed, 19 insertions(+), 64 deletions(-) diff --git a/config.c b/config.c index 09950b46127..c8d941ca627 100644 --- a/config.c +++ b/config.c @@ -59,40 +59,6 @@ struct config_source { }; #define CONFIG_SOURCE_INIT { 0 } -struct config_reader { - /* - * These members record the "current" config source, which can be - * accessed by parsing callbacks. - * - * The "source" variable will be non-NULL only when we are actually - * parsing a real config source (file, blob, cmdline, etc). - */ - struct config_source *source; -}; -/* - * Where possible, prefer to accept "struct config_reader" as an arg than to use - * "the_reader". "the_reader" should only be used if that is infeasible, e.g. in - * a public function. - */ -static struct config_reader the_reader; - -static inline void config_reader_push_source(struct config_reader *reader, - struct config_source *top) -{ - top->prev = reader->source; - reader->source = top; -} - -static inline struct config_source *config_reader_pop_source(struct config_reader *reader) -{ - struct config_source *ret; - if (!reader->source) - BUG("tried to pop config source, but we weren't reading config"); - ret = reader->source; - reader->source = reader->source->prev; - return ret; -} - static int pack_compression_seen; static int zlib_compression_seen; @@ -738,14 +704,9 @@ int git_config_from_parameters(config_fn_t fn, void *data) struct strvec to_free = STRVEC_INIT; int ret = 0; char *envw = NULL; - struct config_source source = CONFIG_SOURCE_INIT; struct key_value_info kvi = { 0 }; - source.origin_type = CONFIG_ORIGIN_CMDLINE; - config_reader_push_source(&the_reader, &source); - kvi_from_param(&kvi); - env = getenv(CONFIG_COUNT_ENVIRONMENT); if (env) { unsigned long count; @@ -802,7 +763,6 @@ out: strbuf_release(&envvar); strvec_clear(&to_free); free(envw); - config_reader_pop_source(&the_reader); return ret; } @@ -1028,7 +988,7 @@ static int do_event(struct config_source *cs, enum config_event_t type, if (data->previous_type != CONFIG_EVENT_EOF && data->opts->event_fn(data->previous_type, data->previous_offset, - offset, data->opts->event_fn_data) < 0) + offset, cs, data->opts->event_fn_data) < 0) return -1; data->previous_type = type; @@ -1986,8 +1946,7 @@ int git_default_config(const char *var, const char *value, * fgetc, ungetc, ftell of top need to be initialized before calling * this function. */ -static int do_config_from(struct config_reader *reader, - struct config_source *top, config_fn_t fn, +static int do_config_from(struct config_source *top, config_fn_t fn, void *data, enum config_scope scope, const struct config_options *opts) { @@ -2000,21 +1959,17 @@ static int do_config_from(struct config_reader *reader, top->total_len = 0; strbuf_init(&top->value, 1024); strbuf_init(&top->var, 1024); - config_reader_push_source(reader, top); kvi_from_source(top, scope, &kvi); ret = git_parse_source(top, fn, &kvi, data, opts); - /* pop config-file parsing state stack */ strbuf_release(&top->value); strbuf_release(&top->var); - config_reader_pop_source(reader); return ret; } -static int do_config_from_file(struct config_reader *reader, - config_fn_t fn, +static int do_config_from_file(config_fn_t fn, const enum config_origin_type origin_type, const char *name, const char *path, FILE *f, void *data, enum config_scope scope, @@ -2033,7 +1988,7 @@ static int do_config_from_file(struct config_reader *reader, top.do_ftell = config_file_ftell; flockfile(f); - ret = do_config_from(reader, &top, fn, data, scope, opts); + ret = do_config_from(&top, fn, data, scope, opts); funlockfile(f); return ret; } @@ -2041,8 +1996,8 @@ static int do_config_from_file(struct config_reader *reader, static int git_config_from_stdin(config_fn_t fn, void *data, enum config_scope scope) { - return do_config_from_file(&the_reader, fn, CONFIG_ORIGIN_STDIN, "", - NULL, stdin, data, scope, NULL); + return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, + data, scope, NULL); } int git_config_from_file_with_options(config_fn_t fn, const char *filename, @@ -2056,9 +2011,8 @@ int git_config_from_file_with_options(config_fn_t fn, const char *filename, BUG("filename cannot be NULL"); f = fopen_or_warn(filename, "r"); if (f) { - ret = do_config_from_file(&the_reader, fn, CONFIG_ORIGIN_FILE, - filename, filename, f, data, scope, - opts); + ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, + filename, f, data, scope, opts); fclose(f); } return ret; @@ -2089,7 +2043,7 @@ int git_config_from_mem(config_fn_t fn, top.do_ungetc = config_buf_ungetc; top.do_ftell = config_buf_ftell; - return do_config_from(&the_reader, &top, fn, data, scope, opts); + return do_config_from(&top, fn, data, scope, opts); } int git_config_from_blob_oid(config_fn_t fn, @@ -2182,8 +2136,7 @@ int git_config_system(void) return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0); } -static int do_git_config_sequence(struct config_reader *reader, - const struct config_options *opts, +static int do_git_config_sequence(const struct config_options *opts, config_fn_t fn, void *data) { int ret = 0; @@ -2272,7 +2225,7 @@ int config_with_options(config_fn_t fn, void *data, ret = git_config_from_blob_ref(fn, repo, config_source->blob, data, config_source->scope); } else { - ret = do_git_config_sequence(&the_reader, opts, fn, data); + ret = do_git_config_sequence(opts, fn, data); } if (inc.remote_urls) { @@ -2978,7 +2931,6 @@ void git_die_config(const char *key, const char *err, ...) */ struct config_store_data { - struct config_reader *config_reader; size_t baselen; char *key; int do_not_match; @@ -3024,11 +2976,10 @@ static int matches(const char *key, const char *value, (value && !regexec(store->value_pattern, value, 0, NULL, 0)); } -static int store_aux_event(enum config_event_t type, - size_t begin, size_t end, void *data) +static int store_aux_event(enum config_event_t type, size_t begin, size_t end, + struct config_source *cs, void *data) { struct config_store_data *store = data; - struct config_source *cs = store->config_reader->source; ALLOC_GROW(store->parsed, store->parsed_nr + 1, store->parsed_alloc); store->parsed[store->parsed_nr].begin = begin; @@ -3349,8 +3300,6 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, size_t contents_sz; struct config_store_data store = CONFIG_STORE_INIT; - store.config_reader = &the_reader; - /* parse-key returns negative; flip the sign to feed exit(3) */ ret = 0 - git_config_parse_key(key, &store.key, &store.baselen); if (ret) diff --git a/config.h b/config.h index 123917d1b0a..eaf24aba25d 100644 --- a/config.h +++ b/config.h @@ -73,6 +73,7 @@ enum config_event_t { CONFIG_EVENT_ERROR }; +struct config_source; /* * The parser event function (if not NULL) is called with the event type and * the begin/end offsets of the parsed elements. @@ -82,6 +83,7 @@ enum config_event_t { */ typedef int (*config_parser_event_fn_t)(enum config_event_t type, size_t begin_offset, size_t end_offset, + struct config_source *cs, void *event_fn_data); struct config_options { @@ -101,6 +103,10 @@ struct config_options { const char *commondir; const char *git_dir; + /* + * event_fn and event_fn_data are for internal use only. Handles events + * emitted by the config parser. + */ config_parser_event_fn_t event_fn; void *event_fn_data; enum config_error_action {