git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Patrick Steinhardt <ps@pks.im>, Taylor Blau <me@ttaylorr.com>,
	Karthik Nayak <karthik.188@gmail.com>,
	Christian Couder <christian.couder@gmail.com>,
	Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 1/4] config: move is_config_key_char() to "config.h"
Date: Mon, 14 Apr 2025 18:03:40 +0200	[thread overview]
Message-ID: <20250414160343.2216312-2-christian.couder@gmail.com> (raw)
In-Reply-To: <20250414160343.2216312-1-christian.couder@gmail.com>

The iskeychar() function in "config.c" checks if a character is valid
for the section or variable name part of a config key.

In a follow up commit we will want to check outside "config.c" if a
string can be a valid variable name of a config key, so will will want
to reuse that fonction.

Let's then move it from "config.c" to "config.h", and, while at it,
let's rename it to is_config_key_char().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 config.c | 11 +++--------
 config.h |  9 +++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/config.c b/config.c
index e127afaa8f..f529cb4cbe 100644
--- a/config.c
+++ b/config.c
@@ -531,11 +531,6 @@ void git_config_push_env(const char *spec)
 	free(key);
 }
 
-static inline int iskeychar(int c)
-{
-	return isalnum(c) || c == '-';
-}
-
 /*
  * Auxiliary function to sanity-check and split the key into the section
  * identifier and variable name.
@@ -585,7 +580,7 @@ int git_config_parse_key(const char *key, char **store_key, size_t *baselen_)
 			dot = 1;
 		/* Leave the extended basename untouched.. */
 		if (!dot || i > baselen) {
-			if (!iskeychar(c) ||
+			if (!is_config_key_char(c) ||
 			    (i == baselen + 1 && !isalpha(c))) {
 				error(_("invalid key: %s"), key);
 				goto out_free_ret_1;
@@ -906,7 +901,7 @@ static int get_value(struct config_source *cs, struct key_value_info *kvi,
 		c = get_next_char(cs);
 		if (cs->eof)
 			break;
-		if (!iskeychar(c))
+		if (!is_config_key_char(c))
 			break;
 		strbuf_addch(name, tolower(c));
 	}
@@ -984,7 +979,7 @@ static int get_base_var(struct config_source *cs, struct strbuf *name)
 			return 0;
 		if (isspace(c))
 			return get_extended_base_var(cs, name, c);
-		if (!iskeychar(c) && c != '.')
+		if (!is_config_key_char(c) && c != '.')
 			return -1;
 		strbuf_addch(name, tolower(c));
 	}
diff --git a/config.h b/config.h
index 29a0277483..16df47f446 100644
--- a/config.h
+++ b/config.h
@@ -340,6 +340,15 @@ int repo_config_set_worktree_gently(struct repository *, const char *, const cha
  */
 void repo_config_set(struct repository *, const char *, const char *);
 
+/**
+ * Is this char a valid char for the section or variable name part of
+ * a config key?
+ */
+static inline int is_config_key_char(int c)
+{
+	return isalnum(c) || c == '-';
+}
+
 int git_config_parse_key(const char *, char **, size_t *);
 
 /*
-- 
2.49.0.158.g6ac6832dc3.dirty


  reply	other threads:[~2025-04-14 16:04 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-14 16:03 [PATCH 0/4] Make the "promisor-remote" capability support extra fields Christian Couder
2025-04-14 16:03 ` Christian Couder [this message]
2025-04-14 16:03 ` [PATCH 2/4] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-04-22 10:13   ` Patrick Steinhardt
2025-04-29 15:12     ` Christian Couder
2025-04-14 16:03 ` [PATCH 3/4] promisor-remote: allow a server to advertise extra fields Christian Couder
2025-04-14 22:04   ` Junio C Hamano
2025-04-22 10:13     ` Patrick Steinhardt
2025-04-29 15:12       ` Christian Couder
2025-04-29 15:12     ` Christian Couder
2025-04-14 16:03 ` [PATCH 4/4] promisor-remote: allow a client to check " Christian Couder
2025-04-29 14:52 ` [PATCH v2 0/3] Make the "promisor-remote" capability support more fields Christian Couder
2025-04-29 14:52   ` [PATCH v2 1/3] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-05-07  8:25     ` Patrick Steinhardt
2025-05-19 14:10       ` Christian Couder
2025-05-07 12:27     ` Karthik Nayak
2025-05-19 14:10       ` Christian Couder
2025-04-29 14:52   ` [PATCH v2 2/3] promisor-remote: allow a server to advertise more fields Christian Couder
2025-05-07  8:25     ` Patrick Steinhardt
2025-05-19 14:11       ` Christian Couder
2025-05-27  7:50         ` Patrick Steinhardt
2025-05-27 15:30           ` Junio C Hamano
2025-06-11 13:46           ` Christian Couder
2025-05-07 12:44     ` Karthik Nayak
2025-05-19 14:11       ` Christian Couder
2025-04-29 14:52   ` [PATCH v2 3/3] promisor-remote: allow a client to check fields Christian Couder
2025-05-07  8:25     ` Patrick Steinhardt
2025-05-19 14:11       ` Christian Couder
2025-05-02  9:34   ` [PATCH v2 0/3] Make the "promisor-remote" capability support more fields Christian Couder
2025-05-19 14:12   ` [PATCH v3 0/5] " Christian Couder
2025-05-19 14:12     ` [PATCH v3 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-05-20  9:37       ` Karthik Nayak
2025-05-20 13:32         ` Christian Couder
2025-05-20 16:45           ` Junio C Hamano
2025-05-21  6:33             ` Christian Couder
2025-05-21 15:00               ` Junio C Hamano
2025-06-11 13:47                 ` Christian Couder
2025-05-19 14:12     ` [PATCH v3 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-05-21 20:31       ` Justin Tobler
2025-06-11 13:46         ` Christian Couder
2025-05-27  7:51       ` Patrick Steinhardt
2025-06-11 13:46         ` Christian Couder
2025-05-19 14:12     ` [PATCH v3 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-05-19 14:12     ` [PATCH v3 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-05-19 14:12     ` [PATCH v3 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-06-11 13:45     ` [PATCH v4 0/5] Make the "promisor-remote" capability support more fields Christian Couder
2025-06-11 13:45       ` [PATCH v4 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-06-19 11:53         ` Karthik Nayak
2025-06-25 12:53           ` Christian Couder
2025-06-23 19:38         ` Justin Tobler
2025-06-25 12:52           ` Christian Couder
2025-06-11 13:45       ` [PATCH v4 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-06-19 12:15         ` Karthik Nayak
2025-06-25 12:51           ` Christian Couder
2025-06-23 19:59         ` Justin Tobler
2025-06-25 12:51           ` Christian Couder
2025-06-11 13:45       ` [PATCH v4 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-06-11 13:45       ` [PATCH v4 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-06-11 13:45       ` [PATCH v4 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-06-19 12:18       ` [PATCH v4 0/5] Make the "promisor-remote" capability support more fields Karthik Nayak
2025-06-25 12:50       ` [PATCH v5 " Christian Couder
2025-06-25 12:50         ` [PATCH v5 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-06-25 17:05           ` Junio C Hamano
2025-07-21 14:08             ` Christian Couder
2025-06-25 12:50         ` [PATCH v5 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-06-25 22:29           ` Junio C Hamano
2025-07-21 14:09             ` Christian Couder
2025-07-21 18:53               ` Junio C Hamano
2025-07-31  7:20                 ` Christian Couder
2025-06-27 18:47           ` Jean-Noël Avila
2025-07-21 14:09             ` Christian Couder
2025-06-25 12:50         ` [PATCH v5 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-06-25 12:50         ` [PATCH v5 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-06-25 12:50         ` [PATCH v5 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-07-07 22:35         ` [PATCH v5 0/5] Make the "promisor-remote" capability support more fields Junio C Hamano
2025-07-08  3:34           ` Christian Couder
2025-07-21 14:10         ` [PATCH v6 " Christian Couder
2025-07-21 14:10           ` [PATCH v6 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-07-21 14:10           ` [PATCH v6 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-07-21 14:10           ` [PATCH v6 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-07-21 20:39             ` Junio C Hamano
2025-07-31  7:22               ` Christian Couder
2025-07-21 14:10           ` [PATCH v6 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-07-21 20:59             ` Junio C Hamano
2025-07-31  7:21               ` Christian Couder
2025-07-21 14:10           ` [PATCH v6 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-07-21 20:18             ` Junio C Hamano
2025-07-31  7:23           ` [PATCH v7 0/5] Make the "promisor-remote" capability support more fields Christian Couder
2025-07-31  7:23             ` [PATCH v7 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-07-31  7:23             ` [PATCH v7 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-07-31  7:23             ` [PATCH v7 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-07-31 16:03               ` Junio C Hamano
2025-09-08  5:31                 ` Christian Couder
2025-07-31  7:23             ` [PATCH v7 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-07-31  7:23             ` [PATCH v7 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-07-31 15:48             ` [PATCH v7 0/5] Make the "promisor-remote" capability support more fields Junio C Hamano
2025-08-28 23:32             ` Junio C Hamano
2025-09-08  5:36               ` Christian Couder
2025-09-08  5:30             ` [PATCH v8 0/7] " Christian Couder
2025-09-08  5:30               ` [PATCH v8 1/7] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-09-08  5:30               ` [PATCH v8 2/7] promisor-remote: allow a server to advertise more fields Christian Couder
2025-09-08  5:30               ` [PATCH v8 3/7] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-09-08  5:30               ` [PATCH v8 4/7] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-09-08  5:30               ` [PATCH v8 5/7] promisor-remote: use string_list_split() in filter_promisor_remote() Christian Couder
2025-09-08  5:30               ` [PATCH v8 6/7] promisor-remote: allow a client to check fields Christian Couder
2025-09-08  5:30               ` [PATCH v8 7/7] promisor-remote: use string_list_split() in mark_remotes_as_accepted() Christian Couder
2025-09-08 17:34               ` [PATCH v8 0/7] Make the "promisor-remote" capability support more fields Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250414160343.2216312-2-christian.couder@gmail.com \
    --to=christian.couder@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=karthik.188@gmail.com \
    --cc=me@ttaylorr.com \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).