projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix lua plugin linking
[project/uci.git]
/
list.c
diff --git
a/list.c
b/list.c
index
aabcab0
..
6e03f18
100644
(file)
--- a/
list.c
+++ b/
list.c
@@
-74,7
+74,7
@@
uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
error:
free(ptr);
error:
free(ptr);
- UCI_THROW(ctx, ctx->err
no
);
+ UCI_THROW(ctx, ctx->err);
done:
return e;
done:
return e;
@@
-180,7
+180,7
@@
uci_free_section(struct uci_section *s)
uci_free_element(&s->e);
}
uci_free_element(&s->e);
}
-
static
struct uci_package *
+
__plugin
struct uci_package *
uci_alloc_package(struct uci_context *ctx, const char *name)
{
struct uci_package *p;
uci_alloc_package(struct uci_context *ctx, const char *name)
{
struct uci_package *p;
@@
-217,7
+217,7
@@
uci_free_package(struct uci_package **package)
*package = NULL;
}
*package = NULL;
}
-static struct uci_element *uci_lookup_list(struct uci_
context *ctx, struct uci_
list *list, const char *name)
+static struct uci_element *uci_lookup_list(struct uci_list *list, const char *name)
{
struct uci_element *e;
{
struct uci_element *e;
@@
-236,17
+236,17
@@
int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_pac
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, res != NULL);
UCI_ASSERT(ctx, p != NULL);
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, res != NULL);
UCI_ASSERT(ctx, p != NULL);
- UCI_ASSERT(ctx, uci_validate_name(section));
+ UCI_ASSERT(ctx,
section &&
uci_validate_name(section));
if (option)
UCI_ASSERT(ctx, uci_validate_name(option));
if (option)
UCI_ASSERT(ctx, uci_validate_name(option));
- e = uci_lookup_list(
ctx,
&p->sections, section);
+ e = uci_lookup_list(&p->sections, section);
if (!e)
goto notfound;
if (option) {
s = uci_to_section(e);
if (!e)
goto notfound;
if (option) {
s = uci_to_section(e);
- e = uci_lookup_list(
ctx,
&s->options, option);
+ e = uci_lookup_list(&s->options, option);
if (!e)
goto notfound;
}
if (!e)
goto notfound;
}
@@
-401,6
+401,7
@@
int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
{
int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
{
+ bool internal = ctx->internal;
struct uci_section *s;
UCI_HANDLE_ERR(ctx);
struct uci_section *s;
UCI_HANDLE_ERR(ctx);
@@
-408,7
+409,8
@@
int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type,
s = uci_alloc_section(p, type, NULL);
uci_fixup_section(ctx, s);
*res = s;
s = uci_alloc_section(p, type, NULL);
uci_fixup_section(ctx, s);
*res = s;
- uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
return 0;
}
return 0;
}
@@
-451,7
+453,7
@@
int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
* if the section/option is to be modified and it is not found
* create a new element in the appropriate list
*/
* if the section/option is to be modified and it is not found
* create a new element in the appropriate list
*/
- e = uci_lookup_list(
ctx,
&p->sections, section);
+ e = uci_lookup_list(&p->sections, section);
if (!e)
goto notfound;
if (!e)
goto notfound;
@@
-460,7
+462,7
@@
int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
ctx->pctx->section = s;
if (option) {
ctx->pctx->section = s;
if (option) {
- e = uci_lookup_list(
ctx,
&s->options, option);
+ e = uci_lookup_list(&s->options, option);
if (!e)
goto notfound;
o = uci_to_option(e);
if (!e)
goto notfound;
o = uci_to_option(e);