From 99ae0f9196c8f8f334624c05a23e7e930be6c5eb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 28 Nov 2008 11:33:23 +0100 Subject: add foreign key and list support for ucimap --- ucimap.h | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'ucimap.h') diff --git a/ucimap.h b/ucimap.h index 0237fb1..43f54e0 100644 --- a/ucimap.h +++ b/ucimap.h @@ -44,31 +44,39 @@ struct uci_sectmap; struct uci_optmap; 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 { +union uci_datamap { + int i; + bool b; + const char *s; + void *section; struct list_head list; - struct uci_sectmap *sm; - const char *section_name; - unsigned long allocmap_len; - - /* list of allocations done by ucimap */ - void **allocmap; +}; - /* map for changed fields */ - unsigned char *cmap; +struct uci_listmap { + struct list_head list; + union uci_datamap data; }; struct uci_sectmap { @@ -105,6 +113,7 @@ struct uci_optmap { struct { int maxlen; } s; + struct uci_sectmap *sm; } data; }; -- cgit v1.2.1