ucimap: rename uci_sectmap* to uci_sectionmap*

[uci.git] / ucimap.h

diff --git a/ucimap.h b/ucimap.h
index adb7004e5337ff7ef00c27d964fc77f26d089df6..961d34efcb8effc272775722409c4488b1873079 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -33,15 +33,16 @@
        (_name[(_bit) / 8] & (1 << ((_bit) % 8)))
 
 #define UCIMAP_OPTION(_type, _field) \
+       .type = UCIMAP_CUSTOM, \
        .name = #_field, \
        .offset = offsetof(_type, _field)
 
-struct uci_sectmap;
+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,13 +61,14 @@ 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;
 };
@@ -76,7 +78,7 @@ struct uci_listmap {
        union ucimap_data data;
 };
 
-struct uci_sectmap {
+struct uci_sectionmap {
        /* type string for the uci section */
        const char *type;
 
@@ -84,13 +86,13 @@ struct uci_sectmap {
        unsigned int alloc_len;
 
        /* give the caller time to initialize the preallocated struct */
-       int (*init_section)(struct uci_map *map, void *section, struct uci_section *s);
+       int (*init)(struct uci_map *map, void *section, struct uci_section *s);
 
        /* pass the fully processed struct to the callback after the section end */
-       int (*add_section)(struct uci_map *map, void *section);
+       int (*add)(struct uci_map *map, void *section);
 
        /* let the callback clean up its own stuff in the section */
-       int (*free_section)(struct uci_map *map, void *section);
+       int (*free)(struct uci_map *map, void *section);
 
        /* list of option mappings for this section */
        struct uci_optmap *options;
@@ -102,6 +104,7 @@ 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);
        union {
                struct {
                        int base;
@@ -111,7 +114,7 @@ struct uci_optmap {
                struct {
                        int maxlen;
                } s;
-               struct uci_sectmap *sm;
+               struct uci_sectionmap *sm;
        } data;
 };