[PATCH] config: store allocated string in non-const pointer
- From
Jeff King <peff@peff.net>
- Date
- Mar 26, 2026, 19:23 UTC
- Message-ID
- <20260326192320.GA418281@coredump.intra.peff.net>
- In-Reply-To
- <xmqqy0jepjqy.fsf@gitster.g>
On Thu, Mar 26, 2026 at 10:45:41AM -0700, Junio C Hamano wrote:
> > But we can untangle this for the compiler without having to cast by > > using a non-const alias, like: > [...] > Yeah, this is much clearer.
Here it is as a patch with a commit message. I was eventually planning to do a complete series that cleans up all the warnings, and this would be part of it. But since other people are starting to work on it, too, it may make sense to just send them out as we have them to avoid too much duplication.
-- >8 -- Subject: [PATCH] config: store allocated string in non-const pointer
When git-config matches a url, we copy the variable section name and store it in the "section" member of a urlmatch_config struct. That member is const, since the url-matcher will not touch it (and other callers really will have a const string).
But that means that we have only a const pointer to our allocated string. We have to cast away the constness when we free it, and likewise when we assign NUL to tie off the "." separating the subsection and key. This latter happens implicitly via a strchr() call, but recent versions of glibc have added annotations that let the compiler detect that and complain.
Let's keep our own "section" pointer for the non-const string, and then just point config.section at it. That avoids all of the casting, both explicit and implicit.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c index 7c4857be62..cf4ba0f7cc 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -838,6 +838,7 @@ static int get_urlmatch(const struct config_location_options *opts, const char *var, const char *url) { int ret; + char *section; char *section_tail; struct config_display_options display_opts = *_display_opts; struct string_list_item *item; @@ -851,8 +852,8 @@ static int get_urlmatch(const struct config_location_options *opts, if (!url_normalize(url, &config.url)) die("%s", config.url.err); - config.section = xstrdup_tolower(var); - section_tail = strchr(config.section, '.'); + config.section = section = xstrdup_tolower(var); + section_tail = strchr(section, '.'); if (section_tail) { *section_tail = '\0'; config.key = section_tail + 1; @@ -886,7 +887,7 @@ static int get_urlmatch(const struct config_location_options *opts, string_list_clear(&values, 1); free(config.url.url); - free((void *)config.section); + free(section); return ret; }
-- 2.53.0.1081.gf77a8b8145