ucimap: cleanup OPTMAP_OPTION macro, rename to UCIMAP_OPTION

diff --git a/ucimap-example.c b/ucimap-example.c
index 6a91f0aa7b1a1c1a85877512916010b4015f7d66..1c0ed388ac130221dca125a35c7106b085168dfa 100644 (file)
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -86,12 +86,37 @@ static struct uci_sectmap network_interface;
 static struct uci_sectmap network_alias;
 
 static struct uci_optmap network_interface_options[] = {
-       OPTMAP_OPTION(UCIMAP_STRING, struct uci_network, proto, .data.s.maxlen = 32),
-       OPTMAP_OPTION(UCIMAP_STRING, struct uci_network, ifname),
-       OPTMAP_OPTION(UCIMAP_STRING, struct uci_network, ipaddr),
-       OPTMAP_OPTION(UCIMAP_BOOL, struct uci_network, enabled),
-       OPTMAP_OPTION(UCIMAP_INT, struct uci_network, test),
-       OPTMAP_OPTION(UCIMAP_LIST | UCIMAP_SECTION, struct uci_network, aliases, .data.sm = &network_alias),
+       {
+               UCIMAP_OPTION(struct uci_network, proto),
+               .type = UCIMAP_STRING,
+               .name = "proto",
+               .data.s.maxlen = 32,
+       },
+       {
+               UCIMAP_OPTION(struct uci_network, ifname),
+               .type = UCIMAP_STRING,
+               .name = "ifname"
+       },
+       {
+               UCIMAP_OPTION(struct uci_network, ipaddr),
+               .type = UCIMAP_STRING,
+               .name = "ipaddr",
+       },
+       {
+               UCIMAP_OPTION(struct uci_network, enabled),
+               .type = UCIMAP_BOOL,
+               .name = "enabled",
+       },
+       {
+               UCIMAP_OPTION(struct uci_network, test),
+               .type = UCIMAP_INT,
+               .name = "test"
+       },
+       {
+               UCIMAP_OPTION(struct uci_network, aliases),
+               .type = UCIMAP_LIST | UCIMAP_SECTION,
+               .data.sm = &network_alias
+       }
 };
 
 static struct uci_sectmap network_interface = {
@@ -104,7 +129,11 @@ static struct uci_sectmap network_interface = {
 };
 
 static struct uci_optmap network_alias_options[] = {
-       OPTMAP_OPTION(UCIMAP_SECTION, struct uci_alias, interface, .data.sm = &network_interface),
+       {
+               UCIMAP_OPTION(struct uci_alias, interface),
+               .type = UCIMAP_SECTION,
+               .data.sm = &network_interface
+       }
 };
 
 static struct uci_sectmap network_alias = {

diff --git a/ucimap.h b/ucimap.h
index 94095009aed5066f8c4f40a331555e8c277fc35d..adb7004e5337ff7ef00c27d964fc77f26d089df6 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -32,13 +32,9 @@
 #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) \
+       .name = #_field, \
+       .offset = offsetof(_type, _field)
 
 struct uci_sectmap;
 struct uci_optmap;