Merge pull request #7258 from libgit2/ethomson/build

ethomson · web-flow · commit a7c02c9f4531 · 2026-05-11T21:21:53.000+01:00
Avoid uninitialized variable warnings in gcc
diff --git a/src/cli/opt.c b/src/cli/opt.c
@@ -359,7 +359,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_sort(
 	const char *arg)
 {
 	int is_negated, has_value = 0;
-	const char *value;
+	const char *value = NULL;
 	const cli_opt_spec *spec = NULL;
 	size_t idx = 0;
 
diff --git a/src/libgit2/index.c b/src/libgit2/index.c
@@ -1210,7 +1210,7 @@ static int canonicalize_directory_path(
 {
 	const git_index_entry *match, *best = NULL;
 	char *search, *sep;
-	size_t pos, search_len, best_len;
+	size_t pos, search_len, best_len = 0;
 
 	if (!index->ignore_case)
 		return 0;
diff --git a/src/libgit2/midx.c b/src/libgit2/midx.c
@@ -460,7 +460,7 @@ int git_midx_foreach_entry(
 {
 	git_oid oid;
 	size_t oid_size, i;
-	int error;
+	int error = 0;
 
 	GIT_ASSERT_ARG(idx);
 
diff --git a/src/util/hashmap.h b/src/util/hashmap.h
@@ -107,6 +107,7 @@ typedef uint32_t git_hashmap_iter_t;
 	} \
 	GIT_INLINE(int) name##__idx(uint32_t *out, name *h, key_t key) \
 	{ \
+		*out = UINT_MAX; \
 		if (h->n_buckets) { \
 			uint32_t k, i, last, mask, step = 0; \
 			GIT_ASSERT((h)->flags); \
diff --git a/src/util/runtime.c b/src/util/runtime.c
@@ -16,7 +16,7 @@ static git_atomic32 init_count;
 static int init_common(git_runtime_init_fn init_fns[], size_t cnt)
 {
 	size_t i;
-	int ret;
+	int ret = 0;
 
 	/* Initialize subsystems that have global state */
 	for (i = 0; i < cnt; i++) {
@@ -110,7 +110,7 @@ GIT_INLINE(int) init_unlock(void)
 
 int git_runtime_init(git_runtime_init_fn init_fns[], size_t cnt)
 {
-	int ret;
+	int ret = 0;
 
 	if (init_lock() < 0)
 		return -1;

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_sort(`
`359`	`359`	`const char *arg)`
`360`	`360`	`{`
`361`	`361`	`int is_negated, has_value = 0;`
`362`		`- const char *value;`
	`362`	`+ const char *value = NULL;`
`363`	`363`	`const cli_opt_spec *spec = NULL;`
`364`	`364`	`size_t idx = 0;`
`365`	`365`
Original file line number	Diff line number	Diff line change
`@@ -1210,7 +1210,7 @@ static int canonicalize_directory_path(`
`1210`	`1210`	`{`
`1211`	`1211`	`const git_index_entry match, best = NULL;`
`1212`	`1212`	`char search, sep;`
`1213`		`- size_t pos, search_len, best_len;`
	`1213`	`+ size_t pos, search_len, best_len = 0;`
`1214`	`1214`
`1215`	`1215`	`if (!index->ignore_case)`
`1216`	`1216`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ int git_midx_foreach_entry(`
`460`	`460`	`{`
`461`	`461`	`git_oid oid;`
`462`	`462`	`size_t oid_size, i;`
`463`		`- int error;`
	`463`	`+ int error = 0;`
`464`	`464`
`465`	`465`	`GIT_ASSERT_ARG(idx);`
`466`	`466`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ static git_atomic32 init_count;`
`16`	`16`	`static int init_common(git_runtime_init_fn init_fns[], size_t cnt)`
`17`	`17`	`{`
`18`	`18`	`size_t i;`
`19`		`- int ret;`
	`19`	`+ int ret = 0;`
`20`	`20`
`21`	`21`	`/* Initialize subsystems that have global state */`
`22`	`22`	`for (i = 0; i < cnt; i++) {`
`@@ -110,7 +110,7 @@ GIT_INLINE(int) init_unlock(void)`
`110`	`110`
`111`	`111`	`int git_runtime_init(git_runtime_init_fn init_fns[], size_t cnt)`
`112`	`112`	`{`
`113`		`- int ret;`
	`113`	`+ int ret = 0;`
`114`	`114`
`115`	`115`	`if (init_lock() < 0)`
`116`	`116`	`return -1;`