admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reftable/stack: fix compiler warning due to missing braces

Browse Source 
While perfectly legal, older compiler toolchains complain when
zero-initializing structs that contain nested structs with `{0}`:

    /home/libgit2/source/deps/reftable/stack.c:862:35: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
            struct reftable_addition empty = REFTABLE_ADDITION_INIT;
                                             ^~~~~~~~~~~~~~~~~~~~~~
    /home/libgit2/source/deps/reftable/stack.c:707:33: note: expanded from macro 'REFTABLE_ADDITION_INIT'
    #define REFTABLE_ADDITION_INIT {0}
                                    ^

We had the discussion around whether or not we want to handle such bogus
compiler errors in the past already [1]. Back then we basically decided
that we do not care about such old-and-buggy compilers, so while we
could fix the issue by using `{{0}}` instead this is not the preferred
way to handle this in the Git codebase.

We have an easier fix though: we can just drop the macro altogether and
handle initialization of the struct in `reftable_stack_addition_init()`.
Callers are expected to call this function already, so this change even
simplifies the calling convention.

[1]: https://lore.kernel.org/git/20220710081135.74964-1-sunshine@sunshineco.com/T/

Suggested-by: Carlo Arenas <carenas@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-08-12 11:54:18 +02:00
committed by Junio C Hamano
parent 5ed5f5dc01
commit 6fb1d819b7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
reftable/stack.c
View File

@@ -664,8 +664,6 @@ struct reftable_addition {
uint64_t next_update_index; uint64_t next_update_index;
}; };
#define REFTABLE_ADDITION_INIT {0}
static void reftable_addition_close(struct reftable_addition *add) static void reftable_addition_close(struct reftable_addition *add)
{ {
struct reftable_buf nm = REFTABLE_BUF_INIT; struct reftable_buf nm = REFTABLE_BUF_INIT;
@@ -693,6 +691,7 @@ static int reftable_stack_init_addition(struct reftable_addition *add,
struct reftable_buf lock_file_name = REFTABLE_BUF_INIT; struct reftable_buf lock_file_name = REFTABLE_BUF_INIT;
int err; int err;
memset(add, 0, sizeof(*add));
add->stack = st; add->stack = st;
err = flock_acquire(&add->tables_list_lock, st->list_file, err = flock_acquire(&add->tables_list_lock, st->list_file,
@@ -739,8 +738,10 @@ static int stack_try_add(struct reftable_stack *st,
void *arg), void *arg),
void *arg) void *arg)
{ {
struct reftable_addition add = REFTABLE_ADDITION_INIT; struct reftable_addition add;
int err = reftable_stack_init_addition(&add, st, 0); int err;
err = reftable_stack_init_addition(&add, st, 0);
if (err < 0) if (err < 0)
goto done; goto done;
@@ -866,19 +867,18 @@ int reftable_stack_new_addition(struct reftable_addition **dest,
struct reftable_stack *st, struct reftable_stack *st,
unsigned int flags) unsigned int flags)
{ {
int err = 0; int err;
struct reftable_addition empty = REFTABLE_ADDITION_INIT;
REFTABLE_CALLOC_ARRAY(*dest, 1); REFTABLE_CALLOC_ARRAY(*dest, 1);
if (!*dest) if (!*dest)
return REFTABLE_OUT_OF_MEMORY_ERROR; return REFTABLE_OUT_OF_MEMORY_ERROR;
**dest = empty;
err = reftable_stack_init_addition(*dest, st, flags); err = reftable_stack_init_addition(*dest, st, flags);
if (err) { if (err) {
reftable_free(*dest); reftable_free(*dest);
*dest = NULL; *dest = NULL;
} }
return err; return err;
} }