shorten callback names

[project/uci.git] / ucimap-example.c

diff --git a/ucimap-example.c b/ucimap-example.c
index 6a91f0a..ca55931 100644 (file)
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -82,37 +82,84 @@ network_add_alias(struct uci_map *map, void *section)
        return 0;
 }
 
+struct my_optmap {
+       struct uci_optmap map;
+       int test;
+};
+
 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),
+static struct my_optmap network_interface_options[] = {
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, proto),
+                       .type = UCIMAP_STRING,
+                       .name = "proto",
+                       .data.s.maxlen = 32,
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, ifname),
+                       .type = UCIMAP_STRING,
+                       .name = "ifname"
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, ipaddr),
+                       .type = UCIMAP_STRING,
+                       .name = "ipaddr",
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, enabled),
+                       .type = UCIMAP_BOOL,
+                       .name = "enabled",
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, test),
+                       .type = UCIMAP_INT,
+                       .name = "test"
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, aliases),
+                       .type = UCIMAP_LIST | UCIMAP_SECTION,
+                       .data.sm = &network_alias
+               }
+       }
 };
 
 static struct uci_sectmap network_interface = {
        .type = "interface",
-       .options = network_interface_options,
        .alloc_len = sizeof(struct uci_network),
-       .init_section = network_init_interface,
-       .add_section = network_add_interface,
+       .init = network_init_interface,
+       .add = network_add_interface,
+       .options = &network_interface_options[0].map,
        .n_options = ARRAY_SIZE(network_interface_options),
+       .options_size = sizeof(struct my_optmap)
 };
 
 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 = {
        .type = "alias",
        .options = network_alias_options,
        .alloc_len = sizeof(struct uci_network),
-       .init_section = network_init_alias,
-       .add_section = network_add_alias,
+       .init = network_init_alias,
+       .add = network_add_alias,
        .n_options = ARRAY_SIZE(network_alias_options),
 };