ci: Fix cases of -Werror=discarded-qualifiers raised by gcc 15.2

ambv · ambv · commit fadbef196e77 · 2025-12-06T23:02:39.000+01:00
diff --git a/src/cli/opt.c b/src/cli/opt.c
@@ -50,7 +50,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_long(
 	const char *arg)
 {
 	const cli_opt_spec *spec;
-	char *eql;
+	const char *eql;
 	size_t eql_pos;
 
 	eql = strchr(arg, '=');
diff --git a/src/libgit2/attr_file.c b/src/libgit2/attr_file.c
@@ -811,7 +811,7 @@ int git_attr_fnmatch__parse(
 	}
 
 	if (context) {
-		char *slash = strrchr(context, '/');
+		const char *slash = strrchr(context, '/');
 		size_t len;
 		if (slash) {
 			/* include the slash for easier matching */
diff --git a/src/libgit2/config_file.c b/src/libgit2/config_file.c
@@ -1135,7 +1135,8 @@ static int config_file_write(
 	const char *value)
 
 {
-	char *orig_section = NULL, *section = NULL, *orig_name, *name, *ldot;
+	char *orig_section = NULL, *section = NULL;
+	const char *orig_name, *name, *ldot;
 	git_str buf = GIT_STR_INIT, contents = GIT_STR_INIT;
 	git_config_parser parser = GIT_CONFIG_PARSER_INIT;
 	git_filebuf file = GIT_FILEBUF_INIT;
diff --git a/src/libgit2/config_parse.c b/src/libgit2/config_parse.c
@@ -282,7 +282,8 @@ static int skip_bom(git_parse_ctx *parser)
 /* '\"' -> '"' etc */
 static int unescape_line(char **out, bool *is_multi, const char *ptr, int *quote_count)
 {
-	char *str, *fixed, *esc;
+	char *str, *fixed;
+	const char *esc;
 	size_t ptr_len = strlen(ptr), alloc_len;
 
 	*is_multi = false;
diff --git a/src/libgit2/message.c b/src/libgit2/message.c
@@ -33,7 +33,7 @@ static int git_message__prettify(
 
 	int consecutive_empty_lines = 0;
 	size_t i, line_length, rtrimmed_line_length;
-	char *next_newline;
+	const char *next_newline;
 
 	for (i = 0; i < strlen(message); i += line_length) {
 		next_newline = memchr(message + i, '\n', message_len - i);
diff --git a/src/libgit2/transports/git.c b/src/libgit2/transports/git.c
@@ -39,7 +39,7 @@ typedef struct {
  */
 static int gen_proto(git_str *request, const char *cmd, const char *url)
 {
-	char *delim, *repo;
+	const char *delim, *repo;
 	char host[] = "host=";
 	size_t len;
 
diff --git a/src/util/unix/process.c b/src/util/unix/process.c
@@ -44,7 +44,7 @@ struct git_process {
 
 GIT_INLINE(bool) is_delete_env(const char *env)
 {
-	char *c = strchr(env, '=');
+	const char *c = strchr(env, '=');
 
 	if (c == NULL)
 		return false;
diff --git a/src/util/util.c b/src/util/util.c
@@ -336,7 +336,7 @@ char *git__strsep(char **end, const char *sep)
 
 size_t git__linenlen(const char *buffer, size_t buffer_len)
 {
-	char *nl = memchr(buffer, '\n', buffer_len);
+	const char *nl = memchr(buffer, '\n', buffer_len);
 	return nl ? (size_t)(nl - buffer) + 1 : buffer_len;
 }
 
diff --git a/tests/clar/clar/print.h b/tests/clar/clar/print.h
@@ -102,7 +102,7 @@ static void clar_print_tap_error(int num, const struct clar_report *report, cons
 
 static void print_escaped(const char *str)
 {
-	char *c;
+	const char *c;
 
 	while ((c = strchr(str, '\'')) != NULL) {
 		printf("%.*s", (int)(c - str), str);
diff --git a/tests/libgit2/diff/drivers.c b/tests/libgit2/diff/drivers.c
@@ -18,7 +18,7 @@ void test_diff_drivers__cleanup(void)
 static void overwrite_filemode(const char *expected, git_buf *actual)
 {
 	size_t offset;
-	char *found;
+	const char *found;
 
 	found = strstr(expected, "100644");
 	if (!found)
diff --git a/tests/libgit2/refs/reflog/reflog.c b/tests/libgit2/refs/reflog/reflog.c
@@ -244,7 +244,7 @@ void test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_succeeds(void
 	 */
 	cl_git_pass(git_str_join_n(&logpath, '/', 3, git_repository_path(g_repo), GIT_REFLOG_DIR, refname));
 	cl_git_pass(git_futils_readbuffer(&logcontents, git_str_cstr(&logpath)));
-	cl_assert((star = strchr(git_str_cstr(&logcontents), '*')) != NULL);
+	cl_assert((star = strchr(logcontents.ptr, '*')) != NULL);
 	*star = '\n';
 	cl_git_rewritefile(git_str_cstr(&logpath), git_str_cstr(&logcontents));
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_long(`
`50`	`50`	`const char *arg)`
`51`	`51`	`{`
`52`	`52`	`const cli_opt_spec *spec;`
`53`		`- char *eql;`
	`53`	`+ const char *eql;`
`54`	`54`	`size_t eql_pos;`
`55`	`55`
`56`	`56`	`eql = strchr(arg, '=');`
Original file line number	Diff line number	Diff line change
`@@ -811,7 +811,7 @@ int git_attr_fnmatch__parse(`
`811`	`811`	`}`
`812`	`812`
`813`	`813`	`if (context) {`
`814`		`- char *slash = strrchr(context, '/');`
	`814`	`+ const char *slash = strrchr(context, '/');`
`815`	`815`	`size_t len;`
`816`	`816`	`if (slash) {`
`817`	`817`	`/* include the slash for easier matching */`
Original file line number	Diff line number	Diff line change
`@@ -1135,7 +1135,8 @@ static int config_file_write(`
`1135`	`1135`	`const char *value)`
`1136`	`1136`
`1137`	`1137`	`{`
`1138`		`- char orig_section = NULL, section = NULL, orig_name, name, *ldot;`
	`1138`	`+ char orig_section = NULL, section = NULL;`
	`1139`	`+ const char orig_name, name, *ldot;`
`1139`	`1140`	`git_str buf = GIT_STR_INIT, contents = GIT_STR_INIT;`
`1140`	`1141`	`git_config_parser parser = GIT_CONFIG_PARSER_INIT;`
`1141`	`1142`	`git_filebuf file = GIT_FILEBUF_INIT;`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,8 @@ static int skip_bom(git_parse_ctx *parser)`
`282`	`282`	`/* '\"' -> '"' etc */`
`283`	`283`	`static int unescape_line(char *out, bool is_multi, const char ptr, int quote_count)`
`284`	`284`	`{`
`285`		`- char str, fixed, *esc;`
	`285`	`+ char str, fixed;`
	`286`	`+ const char *esc;`
`286`	`287`	`size_t ptr_len = strlen(ptr), alloc_len;`
`287`	`288`
`288`	`289`	`*is_multi = false;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ typedef struct {`
`39`	`39`	`*/`
`40`	`40`	`static int gen_proto(git_str request, const char cmd, const char *url)`
`41`	`41`	`{`
`42`		`- char delim, repo;`
	`42`	`+ const char delim, repo;`
`43`	`43`	`char host[] = "host=";`
`44`	`44`	`size_t len;`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct git_process {`
`44`	`44`
`45`	`45`	`GIT_INLINE(bool) is_delete_env(const char *env)`
`46`	`46`	`{`
`47`		`- char *c = strchr(env, '=');`
	`47`	`+ const char *c = strchr(env, '=');`
`48`	`48`
`49`	`49`	`if (c == NULL)`
`50`	`50`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ char git__strsep(char end, const char sep)`
`336`	`336`
`337`	`337`	`size_t git__linenlen(const char *buffer, size_t buffer_len)`
`338`	`338`	`{`
`339`		`- char *nl = memchr(buffer, '\n', buffer_len);`
	`339`	`+ const char *nl = memchr(buffer, '\n', buffer_len);`
`340`	`340`	`return nl ? (size_t)(nl - buffer) + 1 : buffer_len;`
`341`	`341`	`}`
`342`	`342`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ static void clar_print_tap_error(int num, const struct clar_report *report, cons`
`102`	`102`
`103`	`103`	`static void print_escaped(const char *str)`
`104`	`104`	`{`
`105`		`- char *c;`
	`105`	`+ const char *c;`
`106`	`106`
`107`	`107`	`while ((c = strchr(str, '\'')) != NULL) {`
`108`	`108`	`printf("%.*s", (int)(c - str), str);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ void test_diff_drivers__cleanup(void)`
`18`	`18`	`static void overwrite_filemode(const char expected, git_buf actual)`
`19`	`19`	`{`
`20`	`20`	`size_t offset;`
`21`		`- char *found;`
	`21`	`+ const char *found;`
`22`	`22`
`23`	`23`	`found = strstr(expected, "100644");`
`24`	`24`	`if (!found)`