ucimap: free memory allocated for fixups

[project/uci.git] / ucimap.h

diff --git a/ucimap.h b/ucimap.h
index 0237fb1..9409500 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -42,33 +42,42 @@
 
 struct uci_sectmap;
 struct uci_optmap;
+struct ucimap_list;
 
 struct uci_map {
-       struct uci_sectmap *sections;
+       struct uci_sectmap **sections;
        unsigned int n_sections;
        struct list_head sdata;
+       struct list_head fixup;
 
        void *priv; /* user data */
 };
 
 enum ucimap_type {
-       UCIMAP_STRING,
-       UCIMAP_BOOL,
-       UCIMAP_INT,
+       /* types */
+       UCIMAP_SIMPLE   = 0x00,
+       UCIMAP_LIST     = 0x10,
+       UCIMAP_TYPE     = 0xf0, /* type mask */
+
+       /* subtypes */
+       UCIMAP_STRING   = 0x0,
+       UCIMAP_BOOL     = 0x1,
+       UCIMAP_INT      = 0x2,
+       UCIMAP_SECTION  = 0x3,
+       UCIMAP_SUBTYPE  = 0xf, /* subtype mask */
 };
 
-/* ucimap internal */
-struct uci_sectmap_data {
-       struct list_head list;
-       struct uci_sectmap *sm;
-       const char *section_name;
-       unsigned long allocmap_len;
-
-       /* list of allocations done by ucimap */
-       void **allocmap;
+union ucimap_data {
+       int i;
+       bool b;
+       const char *s;
+       void *section;
+       struct ucimap_list *list;
+};
 
-       /* map for changed fields */
-       unsigned char *cmap;
+struct uci_listmap {
+       struct list_head list;
+       union ucimap_data data;
 };
 
 struct uci_sectmap {
@@ -90,6 +99,7 @@ struct uci_sectmap {
        /* list of option mappings for this section */
        struct uci_optmap *options;
        unsigned int n_options;
+       unsigned int options_size;
 };
 
 struct uci_optmap {
@@ -105,9 +115,15 @@ struct uci_optmap {
                struct {
                        int maxlen;
                } s;
+               struct uci_sectmap *sm;
        } data;
 };
 
+struct ucimap_list {
+       int n_items;
+       union ucimap_data item[];
+};
+
 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);