oidtree: avoid nested struct oidtree_node
92d8ed8ac1 (oidtree: a crit-bit tree for odb_loose_cache, 2021-07-07) adds a struct oidtree_node that contains only an n field with a struct cb_node. unfortunately, while building in pedantic mode witch clang 12 (as well as a similar error from gcc 11) it will show: oidtree.c:11:17: error: 'n' may not be nested in a struct due to flexible array member [-Werror,-Wflexible-array-extensions] struct cb_node n; ^ because of a constrain coded in ISO C 11 6.7.2.1¶3 that forbids using structs that contain a flexible array as part of another struct. use a strict cb_node directly instead. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlo Marcelo Arenas Belón committed
Aug 8, 2021 at 18:38 UTC
14825944d7c57b6acd7e1a05a4c6046965efc6a5
1 file changed
+3
-8
oidtree.c
+3
-8
@@ -6,11 +6,6 @@
6
#include "alloc.h"
7
#include "hash.h"
8
9
-struct oidtree_node {
10
- /* n.k[] is used to store "struct object_id" */
11
- struct cb_node n;
12
-};
13
-
9
struct oidtree_iter_data {
10
oidtree_iter fn;
11
void *arg;
@@ -35,13 +30,13 @@ void oidtree_clear(struct oidtree *ot)
30
31
void oidtree_insert(struct oidtree *ot, const struct object_id *oid)
32
{
38
- struct oidtree_node *on;
33
+ struct cb_node *on;
34
35
if (!oid->algo)
36
BUG("oidtree_insert requires oid->algo");
37
38
on = mem_pool_alloc(&ot->mem_pool, sizeof(*on) + sizeof(*oid));
44
- oidcpy_with_padding((struct object_id *)on->n.k, oid);
39
+ oidcpy_with_padding((struct object_id *)on->k, oid);
40
41
/*
42
* n.b. Current callers won't get us duplicates, here. If a
@@ -49,7 +44,7 @@ void oidtree_insert(struct oidtree *ot, const struct object_id *oid)
44
* that won't be freed until oidtree_clear. Currently it's not
45
* worth maintaining a free list
46
*/
52
- cb_insert(&ot->tree, &on->n, sizeof(*oid));
47
+ cb_insert(&ot->tree, on, sizeof(*oid));
48
}
49
50