Commit 2a03b7b3 authored by David Gibson's avatar David Gibson

objset: Use TCON_WRAP instead of TCON

TCON() uses flexible-array members which aren't allowed in the middle
of structures, except as a gcc extension.  TCON_WRAP() avoids this and so
is more portable.

This doesn't change the objset interface, only its internals.
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 2760a60f
...@@ -36,8 +36,10 @@ HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h); ...@@ -36,8 +36,10 @@ HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h);
* }; * };
*/ */
#define OBJSET_MEMBERS(type) \ #define OBJSET_MEMBERS(type) \
struct objset_h raw; \ TCON_WRAP(struct objset_h, type canary) objset_
TCON(type canary)
#define objset_raw(set) \
tcon_unwrap(&(set)->objset_)
/** /**
* objset_init - initialize an empty objset * objset_init - initialize an empty objset
...@@ -48,7 +50,7 @@ HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h); ...@@ -48,7 +50,7 @@ HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h);
* *
* objset_init(&set); * objset_init(&set);
*/ */
#define objset_init(set) objset_h_init(&(set)->raw) #define objset_init(set) objset_h_init(objset_raw(set))
/** /**
* objset_empty - is this set empty? * objset_empty - is this set empty?
...@@ -58,7 +60,7 @@ HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h); ...@@ -58,7 +60,7 @@ HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h);
* if (!objset_empty(&set)) * if (!objset_empty(&set))
* abort(); * abort();
*/ */
#define objset_empty(set) objset_empty_(&(set)->raw) #define objset_empty(set) objset_empty_(objset_raw(set))
static inline bool objset_empty_(const struct objset_h *set) static inline bool objset_empty_(const struct objset_h *set)
{ {
...@@ -83,7 +85,7 @@ static inline bool objset_empty_(const struct objset_h *set) ...@@ -83,7 +85,7 @@ static inline bool objset_empty_(const struct objset_h *set)
* printf("Impossible: value was already in the set?\n"); * printf("Impossible: value was already in the set?\n");
*/ */
#define objset_add(set, value) \ #define objset_add(set, value) \
objset_h_add(&tcon_check((set), canary, (value))->raw, (void *)(value)) objset_h_add(tcon_unwrap(tcon_check(&(set)->objset_, canary, (value))), (void *)(value))
/** /**
* objset_get - get a value from a set * objset_get - get a value from a set
...@@ -97,7 +99,8 @@ static inline bool objset_empty_(const struct objset_h *set) ...@@ -97,7 +99,8 @@ static inline bool objset_empty_(const struct objset_h *set)
* printf("hello => %i\n", *val); * printf("hello => %i\n", *val);
*/ */
#define objset_get(set, member) \ #define objset_get(set, member) \
tcon_cast((set), canary, objset_h_get(&(set)->raw, (member))) tcon_cast(&(set)->objset_, canary, \
objset_h_get(objset_raw(set), (member)))
/** /**
* objset_del - remove a member from the set. * objset_del - remove a member from the set.
...@@ -112,7 +115,7 @@ static inline bool objset_empty_(const struct objset_h *set) ...@@ -112,7 +115,7 @@ static inline bool objset_empty_(const struct objset_h *set)
* printf("val was not in the set?\n"); * printf("val was not in the set?\n");
*/ */
#define objset_del(set, value) \ #define objset_del(set, value) \
objset_h_del(&tcon_check((set), canary, value)->raw, \ objset_h_del(tcon_unwrap(tcon_check(&(set)->objset_, canary, value)), \
(const void *)value) (const void *)value)
/** /**
...@@ -124,7 +127,7 @@ static inline bool objset_empty_(const struct objset_h *set) ...@@ -124,7 +127,7 @@ static inline bool objset_empty_(const struct objset_h *set)
* Example: * Example:
* objset_clear(&set); * objset_clear(&set);
*/ */
#define objset_clear(set) objset_h_clear(&(set)->raw) #define objset_clear(set) objset_h_clear(objset_raw(set))
/** /**
* objset_iter - iterator reference. * objset_iter - iterator reference.
...@@ -150,7 +153,8 @@ struct objset_iter { ...@@ -150,7 +153,8 @@ struct objset_iter {
* printf("One value is %i\n", *v); * printf("One value is %i\n", *v);
*/ */
#define objset_first(set, i) \ #define objset_first(set, i) \
tcon_cast((set), canary, objset_h_first(&(set)->raw, &(i)->iter)) tcon_cast(&(set)->objset_, canary, \
objset_h_first(objset_raw(set), &(i)->iter))
/** /**
* objset_next - get the another element in the set * objset_next - get the another element in the set
...@@ -168,6 +172,7 @@ struct objset_iter { ...@@ -168,6 +172,7 @@ struct objset_iter {
* } * }
*/ */
#define objset_next(set, i) \ #define objset_next(set, i) \
tcon_cast((set), canary, objset_h_next(&(set)->raw, &(i)->iter)) tcon_cast(&(set)->objset_, canary, \
objset_h_next(objset_raw(set), &(i)->iter))
#endif /* CCAN_OBJSET_H */ #endif /* CCAN_OBJSET_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment