Skip to content

Commit 538835d

Browse files
avargitster
authored andcommitted
cbtree.h: define cb_init() in terms of CBTREE_INIT
Use the same pattern for cb_init() as the one established in the recent refactoring of other such patterns in 5726a6b (*.c *_init(): define in terms of corresponding *_INIT macro, 2021-07-01). It has been pointed out[1] that we could perhaps use this C99 replacement of using a compound literal for all of these: *t = (struct cb_tree){ 0 }; But let's just stick to the existing pattern established in 5726a6b for now, we can leave another weather balloon for some other time. 1. http://lore.kernel.org/git/[email protected] Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f69a6e4 commit 538835d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cbtree.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ enum cb_next {
3737
CB_BREAK = 1
3838
};
3939

40-
#define CBTREE_INIT { .root = NULL }
40+
#define CBTREE_INIT { 0 }
4141

4242
static inline void cb_init(struct cb_tree *t)
4343
{
44-
t->root = NULL;
44+
struct cb_tree blank = CBTREE_INIT;
45+
memcpy(t, &blank, sizeof(*t));
4546
}
4647

4748
struct cb_node *cb_lookup(struct cb_tree *, const uint8_t *k, size_t klen);

0 commit comments

Comments
 (0)