X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=ucimap.h;h=2aedc78c0f39b6637bb42d0a0a08d44de340708a;hp=94095009aed5066f8c4f40a331555e8c277fc35d;hb=8ae8a7fc893e18676d6a35193f8a74c87ceb7b7f;hpb=7af0c0eda078866cc0e61e2f437273809ed27596

diff --git a/ucimap.h b/ucimap.h
index 9409500..2aedc78 100644
--- a/ucimap.h
+++ b/ucimap.h
@@ -32,13 +32,10 @@
 #define TEST_BIT(_name, _bit) \
 	(_name[(_bit) / 8] & (1 << ((_bit) % 8)))
 
-#define OPTMAP_OPTION(_maptype, _type, _field, ...) \
-	{ \
-		.type = _maptype, \
-		.name = #_field, \
-		.offset = offsetof(_type, _field), \
-		__VA_ARGS__  \
-	}
+#define UCIMAP_OPTION(_type, _field) \
+	.type = UCIMAP_CUSTOM, \
+	.name = #_field, \
+	.offset = offsetof(_type, _field)
 
 struct uci_sectmap;
 struct uci_optmap;
@@ -64,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;
 };
@@ -88,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;
@@ -106,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;