From: Carlo Marcelo Arenas Belón Date: Thu, 2 Sep 2021 08:52:53 +0000 (-0400) Subject: remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG X-Git-Tag: v2.33.1~54^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6540b716140784f329de7bac954d2651e9d3e321;p=thirdparty%2Fgit.git remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG In make_remote(), we store the return value of hashmap_put() and check it using assert(), but don't otherwise use it. If Git is compiled with NDEBUG, then the assert() becomes a noop, and nobody looks at the variable at all. This causes some compilers to produce warnings. Let's switch it instead to a BUG(). This accomplishes the same thing, but is always compiled in (and we don't have to worry about the cost; the check is cheap, and this is not a hot code path). Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/remote.c b/remote.c index dfb863d808..40e785da38 100644 --- a/remote.c +++ b/remote.c @@ -135,7 +135,7 @@ static inline void init_remotes_hash(void) static struct remote *make_remote(const char *name, int len) { - struct remote *ret, *replaced; + struct remote *ret; struct remotes_hash_key lookup; struct hashmap_entry lookup_entry, *e; @@ -162,8 +162,8 @@ static struct remote *make_remote(const char *name, int len) remotes[remotes_nr++] = ret; hashmap_entry_init(&ret->ent, lookup_entry.hash); - replaced = hashmap_put_entry(&remotes_hash, ret, ent); - assert(replaced == NULL); /* no previous entry overwritten */ + if (hashmap_put_entry(&remotes_hash, ret, ent)) + BUG("hashmap_put overwrote entry after hashmap_get returned NULL"); return ret; }