fix ucimap_set_changed

[uci.git] / ucimap-example.c

diff --git a/ucimap-example.c b/ucimap-example.c
index 3fd3765ab2c92ba0cb8d5f8b6a531aaddd1e6940..6a91f0aa7b1a1c1a85877512916010b4015f7d66 100644 (file)
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -29,7 +29,7 @@ struct uci_network {
        const char *ipaddr;
        int test;
        bool enabled;
-       struct list_head aliases;
+       struct ucimap_list *aliases;
 };
 
 struct uci_alias {
@@ -82,10 +82,10 @@ network_add_alias(struct uci_map *map, void *section)
        return 0;
 }
 
-struct uci_sectmap network_interface;
-struct uci_sectmap network_alias;
+static struct uci_sectmap network_interface;
+static struct uci_sectmap network_alias;
 
-struct uci_optmap network_interface_options[] = {
+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),
@@ -94,7 +94,7 @@ struct uci_optmap network_interface_options[] = {
        OPTMAP_OPTION(UCIMAP_LIST | UCIMAP_SECTION, struct uci_network, aliases, .data.sm = &network_alias),
 };
 
-struct uci_sectmap network_interface = {
+static struct uci_sectmap network_interface = {
        .type = "interface",
        .options = network_interface_options,
        .alloc_len = sizeof(struct uci_network),
@@ -103,11 +103,11 @@ struct uci_sectmap network_interface = {
        .n_options = ARRAY_SIZE(network_interface_options),
 };
 
-struct uci_optmap network_alias_options[] = {
+static struct uci_optmap network_alias_options[] = {
        OPTMAP_OPTION(UCIMAP_SECTION, struct uci_alias, interface, .data.sm = &network_interface),
 };
 
-struct uci_sectmap network_alias = {
+static struct uci_sectmap network_alias = {
        .type = "alias",
        .options = network_alias_options,
        .alloc_len = sizeof(struct uci_network),
@@ -116,12 +116,12 @@ struct uci_sectmap network_alias = {
        .n_options = ARRAY_SIZE(network_alias_options),
 };
 
-struct uci_sectmap *network_smap[] = {
+static struct uci_sectmap *network_smap[] = {
        &network_interface,
        &network_alias,
 };
 
-struct uci_map network_map = {
+static struct uci_map network_map = {
        .sections = network_smap,
        .n_sections = ARRAY_SIZE(network_smap),
 };
@@ -134,6 +134,7 @@ int main(int argc, char **argv)
        struct list_head *p, *p2;
        struct uci_network *net;
        struct uci_alias *alias;
+       int i;
 
        INIT_LIST_HEAD(&ifs);
        ctx = uci_alloc_context();
@@ -158,9 +159,8 @@ int main(int argc, char **argv)
                        net->test,
                        (net->enabled ? "on" : "off"));
 
-               list_for_each(p2, &net->aliases) {
-                       struct uci_listmap *li = list_entry(p2, struct uci_listmap, list);
-                       alias = li->data.section;
+               for (i = 0; i < net->aliases->n_items; i++) {
+                       alias = net->aliases->item[i].section;
                        printf("New alias: %s\n", alias->name);
                }
 #if 0