From mboxrd@z Thu Jan 1 00:00:00 1970 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 0F0F3EB64D9 for ; Mon, 26 Jun 2023 18:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbjFZSLl (ORCPT ); Mon, 26 Jun 2023 14:11:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231192AbjFZSLf (ORCPT ); Mon, 26 Jun 2023 14:11:35 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2F929F for ; Mon, 26 Jun 2023 11:11:33 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-313f59cd193so943017f8f.2 for ; Mon, 26 Jun 2023 11:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687803092; x=1690395092; 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=HoUNGFp0HiayMWP2wM+yeSmJO3gqaXxhgJPNmDBa7hU=; b=OJ23KNPb+M+UIOurmkHlPPIn43FlyWmH5ygU5l24muJATt7DEI0smlHEvrrykQca9N 0eegnuQKMeq3qXjXFYDTrjqprYH72/D162MtQ8uab0vZCsA8nlh01+Zfz32Nfe52i5In 1kmNJCmU8TKPTL51kL6Cy5t1EseSGS65lfxJEhADtcvWv29TmMu2/npdpoklBM8wBSUO pn8BKplH7tii8+y5NbIc8gMCDkFWsCPbMF05AD6NRfDvZwqeMLzPMNRU0dmYscWMAb6I sjoOnm7h6OkSOFCUybVYxVk31T6ouYKQV/+Rw/FAVc2AoA7G/d0C6kyofxqRsDflm65I wmPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687803092; x=1690395092; 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=HoUNGFp0HiayMWP2wM+yeSmJO3gqaXxhgJPNmDBa7hU=; b=d5qoFwwGH8JYyfUAlv+fgXPqn2VomVmUjCQ1bWikxs6Z/Zf8aWU31vJsbDP59rYCZ1 Ez7N7//y0XPpKW0EkdnsqMrBtI4vngzEEQ4PQnZus+RHzywe6I+76T/Vu5qGYuS73b0i FrBBRMO35t9q3ClSc6t74wgOjjmEHxDt9BHa3s59aNNoRodtZtK2RB8F8mP9ZBOivqDh 4BJ8iXLLEzsd1oALfQ6AVyxd5quYNdz447Nxqd482D4kPDgxtJdtDZXg0zXHGVmc98Am CpxXSvsvAJ/gN1CIFLPcEGMpa8l6/nxkLisKmNjNH4jnsHeIzUVUzx6tYBoMmgfL8uf/ 0lOw== X-Gm-Message-State: AC+VfDy8spzRgMEFzFarJ9weUvWlCrEY7gsQ/NWszLWl0TzbSb/1US/Z QSK4Siv4QHDi2h8jj4D2s5bTB0Sjv7s= X-Google-Smtp-Source: ACHHUZ6CHhCQl+SOyoH3INklAX8VEbXyRd+b4iK1nuVhI27/mzlEG9E4rMJLLzZWue8tSxAI3FVd9A== X-Received: by 2002:adf:f607:0:b0:30e:5fe4:9cc1 with SMTP id t7-20020adff607000000b0030e5fe49cc1mr25419386wrp.29.1687803091901; Mon, 26 Jun 2023 11:11:31 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v1-20020adfe281000000b00311299df211sm8074780wri.77.2023.06.26.11.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 11:11:31 -0700 (PDT) Message-Id: <39b2e291f8669e1d77725619d6b3c2b34b2acecc.1687803085.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Glen Choo via GitGitGadget" Date: Mon, 26 Jun 2023 18:11:15 +0000 Subject: [PATCH v4 04/12] config.c: pass ctx in configsets Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jonathan Tan , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Emily Shaffer , Phillip Wood , Jeff King , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo Pass config_context to config callbacks in configset_iter(), trivially setting the .kvi member to the cached key_value_info. Then, in config callbacks that are only used with configsets, use the .kvi member 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 | 10 ++++++---- config.c | 35 ++++++++++++++++------------------- config.h | 2 +- remote.c | 7 ++++--- t/helper/test-config.c | 11 ++++++----- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 87de81105e2..d47f9ee21cf 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -646,17 +646,19 @@ struct push_default_info }; static int config_read_push_default(const char *key, const char *value, - const struct config_context *ctx UNUSED, void *cb) + const struct config_context *ctx, void *cb) { + const struct key_value_info *kvi = ctx->kvi; + 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 850e432e301..662d406ac1e 100644 --- a/config.c +++ b/config.c @@ -2317,6 +2317,7 @@ 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 config_context ctx = CONFIG_CONTEXT_INIT; for (i = 0; i < list->nr; i++) { entry = list->items[i].e; @@ -2324,12 +2325,11 @@ static void configset_iter(struct config_reader *reader, struct config_set *set, values = &entry->value_list; config_reader_set_kvi(reader, values->items[value_index].util); - - if (fn(entry->key, values->items[value_index].string, NULL, data) < 0) + ctx.kvi = values->items[value_index].util; + if (fn(entry->key, values->items[value_index].string, &ctx, data) < 0) git_die_config_linenr(entry->key, - reader->config_kvi->filename, - reader->config_kvi->linenr); - + ctx.kvi->filename, + ctx.kvi->linenr); config_reader_set_kvi(reader, NULL); } } @@ -3984,13 +3984,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"; @@ -4007,6 +4002,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) { @@ -4054,14 +4059,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 cd30125a8a4..ddf147bb2d1 100644 --- a/config.h +++ b/config.h @@ -387,7 +387,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 241999c2842..1dab860141b 100644 --- a/remote.c +++ b/remote.c @@ -350,7 +350,7 @@ static void read_branches_file(struct remote_state *remote_state, } static int handle_config(const char *key, const char *value, - const struct config_context *ctx UNUSED, void *cb) + const struct config_context *ctx, void *cb) { const char *name; size_t namelen; @@ -358,6 +358,7 @@ static int handle_config(const char *key, const char *value, struct remote *remote; struct branch *branch; struct remote_state *remote_state = cb; + const struct key_value_info *kvi = ctx->kvi; if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) { /* There is no subsection. */ @@ -415,8 +416,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 85ad815358e..3f4c3678318 100644 --- a/t/helper/test-config.c +++ b/t/helper/test-config.c @@ -43,9 +43,10 @@ */ static int iterate_cb(const char *var, const char *value, - const struct config_context *ctx UNUSED, + const struct config_context *ctx, void *data UNUSED) { + const struct key_value_info *kvi = ctx->kvi; static int nr; if (nr++) @@ -53,10 +54,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; } -- gitgitgadget