undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG

Browse Source 
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 <carenas@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Carlo Marcelo Arenas Belón 2021-09-02 04:52:53 -04:00 committed by Junio C Hamano
parent 225bc32a98
commit 6540b71614
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
remote.c
View File

@ -135,7 +135,7 @@ static inline void init_remotes_hash(void)
static struct remote *make_remote(const char *name, int len) static struct remote *make_remote(const char *name, int len)
{ {
struct remote *ret, *replaced; struct remote *ret;
struct remotes_hash_key lookup; struct remotes_hash_key lookup;
struct hashmap_entry lookup_entry, *e; struct hashmap_entry lookup_entry, *e;
@ -162,8 +162,8 @@ static struct remote *make_remote(const char *name, int len)
remotes[remotes_nr++] = ret; remotes[remotes_nr++] = ret;
hashmap_entry_init(&ret->ent, lookup_entry.hash); hashmap_entry_init(&ret->ent, lookup_entry.hash);
replaced = hashmap_put_entry(&remotes_hash, ret, ent); if (hashmap_put_entry(&remotes_hash, ret, ent))
assert(replaced == NULL); /* no previous entry overwritten */ BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
return ret; return ret;
} }