expose the ucimap_parse_section function in the api, do not defer fixups if immediate...

[project/uci.git] / ucimap.h

diff --git a/ucimap.h b/ucimap.h
index fc34090..d9aa2d9 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -11,6 +11,9 @@
  * 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"
@@ -68,6 +71,11 @@ enum ucimap_type {
        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 {
@@ -103,13 +111,13 @@ 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 */
+       /* sectionmap offset, filled in by macro */
        unsigned int smap_offset;
 
-       /* allocate a new data structure and return a pointer to the section map data */
+       /* 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);
 
@@ -157,4 +165,6 @@ extern void ucimap_cleanup(struct uci_map *map);
 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