* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
+#ifndef __UCIMAP_H
+#define __UCIMAP_H
+
#include <stdbool.h>
#include "uci_list.h"
#include "uci.h"
#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) \
+ .alloc_len = sizeof(_name), \
+ .smap_offset = offsetof(_name, _field)
struct uci_sectionmap;
struct uci_optmap;
unsigned int n_sections;
struct list_head sdata;
struct list_head fixup;
+ struct list_head pending;
+ bool parsed;
void *priv; /* user data */
};
UCIMAP_SECTION = 0x3,
UCIMAP_CUSTOM = 0x4,
UCIMAP_SUBTYPE = 0xf, /* subtype mask */
+
+ /* automatically create lists from
+ * options with space-separated items */
+ UCIMAP_LIST_AUTO = 0x0100,
+ UCIMAP_FLAGS = 0xff00, /* flags mask */
};
union ucimap_data {
int i;
bool b;
char *s;
- void *section;
+ void *ptr;
struct ucimap_list *list;
};
+struct ucimap_section_data {
+ struct list_head list;
+ struct uci_map *map;
+ struct uci_sectionmap *sm;
+ const char *section_name;
+
+ /* list of allocations done by ucimap */
+ struct uci_alloc *allocmap;
+ unsigned long allocmap_len;
+
+ /* map for changed fields */
+ unsigned char *cmap;
+ bool done;
+};
+
+
struct uci_listmap {
struct list_head list;
union ucimap_data data;
/* type string for the uci section */
const char *type;
- /* length of the struct to map into */
+ /* length of the struct to map into, filled in by macro */
unsigned int alloc_len;
+ /* sectionmap offset, filled in by macro */
+ unsigned int smap_offset;
+
+ /* return a pointer to the section map data (allocate if necessary) */
+ struct ucimap_section_data *(*alloc)(struct uci_map *map,
+ struct uci_sectionmap *sm, struct uci_section *s);
+
/* give the caller time to initialize the preallocated struct */
int (*init)(struct uci_map *map, void *section, struct uci_section *s);
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);
union {
struct {
int base;
extern int ucimap_init(struct uci_map *map);
extern void ucimap_cleanup(struct uci_map *map);
-extern void ucimap_set_changed(void *section, void *field);
-extern int ucimap_store_section(struct uci_map *map, struct uci_package *p, void *section);
+extern void ucimap_set_changed(struct ucimap_section_data *sd, void *field);
+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);
+#endif