#define TEST_BIT(_name, _bit) \
(_name[(_bit) / 8] & (1 << ((_bit) % 8)))
+#ifndef __GNUC__
+#define __optmap_gen_type(_type, _field) -1
+#else
+
+#define __compatible(_type, _field, _newtype) \
+ __builtin_types_compatible_p(typeof(&(((_type *)0)->_field)), _newtype *)
+
+#define __list_compatible(_type, _field, __val, __else) \
+ __builtin_choose_expr(__compatible(_type, _field, struct ucimap_list *), __val, __else)
+
+#define __int_compatible(_type, _field, __val, __else) \
+ __builtin_choose_expr(__compatible(_type, _field, int), __val, \
+ __builtin_choose_expr(__compatible(_type, _field, unsigned int), __val, \
+ __else))
+
+#define __string_compatible(_type, _field, __val, __else) \
+ __builtin_choose_expr(__compatible(_type, _field, char *), __val, \
+ __builtin_choose_expr(__compatible(_type, _field, unsigned char *), __val, \
+ __builtin_choose_expr(__compatible(_type, _field, const char *), __val, \
+ __builtin_choose_expr(__compatible(_type, _field, const unsigned char *), __val, \
+ __else))))
+
+#define __bool_compatible(_type, _field, __val, __else) \
+ __builtin_choose_expr(__compatible(_type, _field, bool), __val, __else)
+
+
+#define __optmap_gen_type(_type, _field) \
+ __list_compatible(_type, _field, UCIMAP_LIST, \
+ __int_compatible(_type, _field, UCIMAP_INT, \
+ __string_compatible(_type, _field, UCIMAP_STRING, \
+ __bool_compatible(_type, _field, UCIMAP_BOOL, \
+ -1))))
+
+#endif
+
#define UCIMAP_OPTION(_type, _field) \
.type = UCIMAP_CUSTOM, \
.name = #_field, \
- .offset = offsetof(_type, _field)
+ .offset = offsetof(_type, _field), \
+ .detected_type = __optmap_gen_type(_type, _field)
#define UCIMAP_SECTION(_name, _field) \
struct uci_sectionmap;
struct uci_optmap;
struct ucimap_list;
+struct uci_alloc;
+struct uci_alloc_custom;
struct uci_map {
struct uci_sectionmap **sections;
bool b;
char *s;
void *ptr;
+ void **data;
struct ucimap_list *list;
};
/* list of allocations done by ucimap */
struct uci_alloc *allocmap;
- unsigned long allocmap_len;
+ struct uci_alloc_custom *alloc_custom;
+ unsigned int allocmap_len;
+ unsigned int alloc_custom_len;
/* map for changed fields */
unsigned char *cmap;
unsigned int offset;
const char *name;
enum ucimap_type type;
+ int detected_type;
int (*parse)(void *section, struct uci_optmap *om, union ucimap_data *data, const char *string);
int (*format)(void *section, struct uci_optmap *om, union ucimap_data *data, char **string);
+ void (*free)(void *section, struct uci_optmap *om, void *ptr);
union {
struct {
int base;
extern int ucimap_store_section(struct uci_map *map, struct uci_package *p, struct ucimap_section_data *sd);
extern void ucimap_parse(struct uci_map *map, struct uci_package *pkg);
extern int ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct ucimap_section_data *sd, struct uci_section *s);
+extern void ucimap_free_section(struct uci_map *map, struct ucimap_section_data *sd);
#endif