X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=ucimap-example.c;h=1c0ed388ac130221dca125a35c7106b085168dfa;hb=75888e2645fc300311972b7c4430b0b817f822b9;hp=6a91f0aa7b1a1c1a85877512916010b4015f7d66;hpb=1afdbf8f22ab7f8c9cf4d52d897e3b0de1e099e3;p=uci.git

diff --git a/ucimap-example.c b/ucimap-example.c
index 6a91f0a..1c0ed38 100644
--- 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 = {