ucimap: some hints

[project/uci.git] / ucimap.h

diff --git a/ucimap.h b/ucimap.h
index 865c45a..9922f0f 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -33,15 +33,21 @@
        (_name[(_bit) / 8] & (1 << ((_bit) % 8)))
 
 #define UCIMAP_OPTION(_type, _field) \
+       .type = UCIMAP_CUSTOM, \
        .name = #_field, \
        .offset = offsetof(_type, _field)
 
-struct uci_sectmap;
+
+#define UCIMAP_SECTION(_name, _field) \
+       .alloc_len = sizeof(_name), \
+       .smap_offset = offsetof(_name, _field)
+
+struct uci_sectionmap;
 struct uci_optmap;
 struct ucimap_list;
 
 struct uci_map {
-       struct uci_sectmap **sections;
+       struct uci_sectionmap **sections;
        unsigned int n_sections;
        struct list_head sdata;
        struct list_head fixup;
@@ -60,29 +66,53 @@ enum ucimap_type {
        UCIMAP_BOOL     = 0x1,
        UCIMAP_INT      = 0x2,
        UCIMAP_SECTION  = 0x3,
+       UCIMAP_CUSTOM   = 0x4,
        UCIMAP_SUBTYPE  = 0xf, /* subtype mask */
 };
 
 union ucimap_data {
        int i;
        bool b;
-       const char *s;
+       char *s;
        void *section;
        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;
 };
 
-struct uci_sectmap {
+struct uci_sectionmap {
        /* 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;
+
+       /* allocate a new data structure and return a pointer to the section map data */
+       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);
 
@@ -102,6 +132,8 @@ struct uci_optmap {
        unsigned int offset;
        const char *name;
        enum ucimap_type 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;
@@ -111,7 +143,7 @@ struct uci_optmap {
                struct {
                        int maxlen;
                } s;
-               struct uci_sectmap *sm;
+               struct uci_sectionmap *sm;
        } data;
 };
 
@@ -122,7 +154,7 @@ struct ucimap_list {
 
 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);