ucimap: allow api users to take over allocation of section data structures

diff --git a/ucimap.c b/ucimap.c
index 455cf36e02a7fd4e3d37551eb45839e6bdb27d98..d4dc05fe3d8781cc5986b6f2df256422049643ac 100644 (file)
--- a/ucimap.c
+++ b/ucimap.c
@@ -282,11 +282,17 @@ ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct uci_
        int n_alloc = 2;
        int err;
 
-       sd = malloc(sm->alloc_len);
+       if (sm->alloc) {
+               sd = sm->alloc(map, sm, s);
+               memset(sd, 0, sizeof(struct ucimap_section_data));
+       } else {
+               sd = malloc(sm->alloc_len);
+               memset(sd, 0, sm->alloc_len);
+       }
+
        if (!sd)
                return UCI_ERR_MEM;
 
-       memset(sd, 0, sm->alloc_len);
        INIT_LIST_HEAD(&sd->list);
        sd->map = map;
        sd->sm = sm;

diff --git a/ucimap.h b/ucimap.h
index 4254b1e568463a9221be80a620a2f885d8f9e4ac..921ab4ecf954ce62e0c33a43e2343825b12eec73 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -109,6 +109,10 @@ struct uci_sectionmap {
        /* sectionmap offset */
        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);