projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change __uci_list_add to uci_list_insert and remove an unnecessary parameter
[project/uci.git]
/
cli.c
diff --git
a/cli.c
b/cli.c
index
1fe7cc7
..
b7ddd51
100644
(file)
--- a/
cli.c
+++ b/
cli.c
@@
-15,8
+15,6
@@
#include "uci.h"
static struct uci_context *ctx;
#include "uci.h"
static struct uci_context *ctx;
-static char *buf = NULL;
-static int buflen = 256;
static void uci_usage(int argc, char **argv)
{
static void uci_usage(int argc, char **argv)
{
@@
-33,14
+31,14
@@
static void uci_usage(int argc, char **argv)
static void uci_show_section(struct uci_section *p)
{
static void uci_show_section(struct uci_section *p)
{
- struct uci_
option *o
;
+ struct uci_
element *e
;
const char *cname, *sname;
const char *cname, *sname;
- cname = p->package->name;
- sname = p->name;
+ cname = p->package->
e.
name;
+ sname = p->
e.
name;
printf("%s.%s=%s\n", cname, sname, p->type);
printf("%s.%s=%s\n", cname, sname, p->type);
- uci_foreach_e
ntry(option, &p->options, o
) {
- printf("%s.%s.%s=%s\n", cname, sname,
o->name, o
->value);
+ uci_foreach_e
lement(&p->options, e
) {
+ printf("%s.%s.%s=%s\n", cname, sname,
e->name, uci_to_option(e)
->value);
}
}
}
}
@@
-48,11
+46,11
@@
static int uci_show(int argc, char **argv)
{
char *section = (argc > 2 ? argv[2] : NULL);
struct uci_package *package;
{
char *section = (argc > 2 ? argv[2] : NULL);
struct uci_package *package;
- struct uci_
section *s
;
+ struct uci_
element *e
;
char **configs;
char **p;
char **configs;
char **p;
- configs = uci_list_configs();
+ configs = uci_list_configs(
ctx
);
if (!configs)
return 0;
if (!configs)
return 0;
@@
-62,9
+60,9
@@
static int uci_show(int argc, char **argv)
uci_perror(ctx, "uci_load");
return 255;
}
uci_perror(ctx, "uci_load");
return 255;
}
- uci_foreach_e
ntry(section, &package->sections, s
) {
- if (!section || !strcmp(
s
->name, section))
- uci_show_section(
s
);
+ uci_foreach_e
lement( &package->sections, e
) {
+ if (!section || !strcmp(
e
->name, section))
+ uci_show_section(
uci_to_section(e)
);
}
uci_unload(ctx, *p);
}
}
uci_unload(ctx, *p);
}
@@
-75,7
+73,7
@@
static int uci_show(int argc, char **argv)
static int uci_do_export(int argc, char **argv)
{
static int uci_do_export(int argc, char **argv)
{
- char **configs = uci_list_configs();
+ char **configs = uci_list_configs(
ctx
);
char **p;
if (!configs)
char **p;
if (!configs)
@@
-109,13
+107,13
@@
int main(int argc, char **argv)
{
int ret;
{
int ret;
- ctx = uci_alloc();
+ ctx = uci_alloc
_context
();
if (argc < 2)
uci_usage(argc, argv);
ret = uci_cmd(argc - 1, argv + 1);
if (ret == 255)
uci_usage(argc, argv);
if (argc < 2)
uci_usage(argc, argv);
ret = uci_cmd(argc - 1, argv + 1);
if (ret == 255)
uci_usage(argc, argv);
- uci_free(ctx);
+ uci_free
_context
(ctx);
return ret;
}
return ret;
}