consistency: rename uci_config to uci_package, rename variables as well; add some...

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index afe96e3..1fe7cc7 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -36,7 +36,7 @@ static void uci_show_section(struct uci_section *p)
        struct uci_option *o;
        const char *cname, *sname;
 
-       cname = p->config->name;
+       cname = p->package->name;
        sname = p->name;
        printf("%s.%s=%s\n", cname, sname, p->type);
        uci_foreach_entry(option, &p->options, o) {
@@ -44,34 +44,30 @@ static void uci_show_section(struct uci_section *p)
        }
 }
 
-static void foreach_section(const char *configname, const char *section, void (*callback)(struct uci_section *))
-{
-       struct uci_config *cfg;
-       struct uci_section *p;
-
-       if (uci_load(ctx, configname, &cfg) != UCI_OK) {
-               uci_perror(ctx, "uci_load");
-               return;
-       }
-
-       uci_foreach_entry(section, &cfg->sections, p) {
-               if (!section || !strcmp(p->name, section))
-                       callback(p);
-       }
-       uci_unload(ctx, configname);
-}
-
 static int uci_show(int argc, char **argv)
 {
-       char **configs = uci_list_configs();
+       char *section = (argc > 2 ? argv[2] : NULL);
+       struct uci_package *package;
+       struct uci_section *s;
+       char **configs;
        char **p;
 
+       configs = uci_list_configs();
        if (!configs)
                return 0;
 
        for (p = configs; *p; p++) {
-               if ((argc < 2) || !strcmp(argv[1], *p))
-                       foreach_section(*p, (argc > 2 ? argv[2] : NULL), uci_show_section);
+               if ((argc < 2) || !strcmp(argv[1], *p)) {
+                       if (uci_load(ctx, *p, &package) != UCI_OK) {
+                               uci_perror(ctx, "uci_load");
+                               return 255;
+                       }
+                       uci_foreach_entry(section, &package->sections, s) {
+                               if (!section || !strcmp(s->name, section))
+                                       uci_show_section(s);
+                       }
+                       uci_unload(ctx, *p);
+               }
        }
 
        return 0;
@@ -87,13 +83,13 @@ static int uci_do_export(int argc, char **argv)
 
        for (p = configs; *p; p++) {
                if ((argc < 2) || !strcmp(argv[1], *p)) {
-                       struct uci_config *cfg = NULL;
+                       struct uci_package *package = NULL;
                        int ret;
 
-                       ret = uci_load(ctx, *p, &cfg);
+                       ret = uci_load(ctx, *p, &package);
                        if (ret)
                                continue;
-                       uci_export(ctx, stdout, cfg);
+                       uci_export(ctx, stdout, package);
                        uci_unload(ctx, *p);
                }
        }