(_name[(_bit) / 8] & (1 << ((_bit) % 8)))
#ifndef __GNUC__
+
#define __optmap_gen_type(_type, _field) -1
-#else
+
+#ifndef likely
+#define likely(_expr) !!(_expr)
+#endif
+
+#ifndef unlikely
+#define unlikely(_expr) !!(_expr)
+#endif
+
+#else /* __GNUC__ */
#define __compatible(_type, _field, _newtype) \
__builtin_types_compatible_p(typeof(&(((_type *)0)->_field)), _newtype *)
__bool_compatible(_type, _field, UCIMAP_BOOL, \
-1))))
+#ifndef likely
+#define likely(x) __builtin_expect(!!(x), 1)
+#endif
+
+#ifndef unlikely
+#define unlikely(x) __builtin_expect(!!(x), 0)
#endif
+#endif /* __GNUC__ */
+
#define UCIMAP_OPTION(_type, _field) \
.type = UCIMAP_CUSTOM, \
.name = #_field, \
.offset = offsetof(_type, _field), \
- .detected_type = __optmap_gen_type(_type, _field)
+ .detected_type = __optmap_gen_type(_type, _field), \
+ .type_name = #_type
#define UCIMAP_SECTION(_name, _field) \
.alloc_len = sizeof(_name), \
- .smap_offset = offsetof(_name, _field)
+ .smap_offset = offsetof(_name, _field), \
+ .type_name = #_name
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;
bool done;
};
-
-struct uci_listmap {
- struct list_head list;
- union ucimap_data data;
-};
-
struct uci_sectionmap {
/* type string for the uci section */
const char *type;
struct uci_optmap *options;
unsigned int n_options;
unsigned int options_size;
+
+ /* internal */
+ const char *type_name;
};
struct uci_optmap {
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;
} s;
struct uci_sectionmap *sm;
} data;
+
+ /* internal */
+ int detected_type;
+ const char *type_name;
};
struct ucimap_list {
int n_items;
+ int size;
union ucimap_data item[];
};
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);
+extern int ucimap_resize_list(struct ucimap_section_data *sd, struct ucimap_list **list, int items);
+extern void ucimap_free_item(struct ucimap_section_data *sd, void *item);
#endif