X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=list.c;h=6e03f18bdec9d4a4396064a6edfd1a67905887cd;hb=f1ae2ddc4ff16e541c46f595073bf277cd8f778a;hp=fb4d478f6e2509008fa7991619e7ab47b5d97652;hpb=53726f5dd57ab09a206c96108a71db25e7517caa;p=project%2Fuci.git diff --git a/list.c b/list.c index fb4d478..6e03f18 100644 --- 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); - UCI_THROW(ctx, ctx->errno); + UCI_THROW(ctx, ctx->err); done: return e; @@ -180,7 +180,7 @@ uci_free_section(struct uci_section *s) 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; @@ -236,7 +236,7 @@ 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_ASSERT(ctx, uci_validate_name(section)); + UCI_ASSERT(ctx, section && uci_validate_name(section)); if (option) UCI_ASSERT(ctx, uci_validate_name(option)); @@ -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) { + bool internal = ctx->internal; 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; - 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; }