X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=02726213deb6977b14c00f3c81f24c395b454a03;hp=a28c5e17a2aa51d0a4c18c15c31b252346d1e705;hb=e080da8799d1e7aa57a4fc44574361f3e9dbd822;hpb=9f540f2106dcf724e4b8c41489d4bda6ccfe65d8

diff --git a/list.c b/list.c
index a28c5e1..0272621 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;
@@ -217,7 +217,7 @@ uci_free_package(struct uci_package **package)
 	*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;
 
@@ -228,7 +228,7 @@ static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_l
 	return NULL;
 }
 
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, const char *section, const char *option)
 {
 	struct uci_element *e;
 	struct uci_section *s;
@@ -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_ASSERT(ctx, uci_validate_name(section));
+	UCI_ASSERT(ctx, section && uci_validate_name(section));
 	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);
-		e = uci_lookup_list(ctx, &s->options, option);
+		e = uci_lookup_list(&s->options, option);
 		if (!e)
 			goto notfound;
 	}
@@ -291,7 +291,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 	}
 
 	p = s->package;
-	if (!internal && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);
 
 	switch(e->type) {
@@ -307,7 +307,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 	return 0;
 }
 
-int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value)
 {
 	/* NB: UCI_INTERNAL use means without history tracking */
 	bool internal = ctx->internal;
@@ -354,7 +354,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 		return 0;
 	}
 	p = s->package;
-	if (!internal && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
 
 	uci_list_del(&e->list);
@@ -388,7 +388,7 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
 	/* NB: p, section, option validated by uci_lookup */
 	UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 
-	if (!internal && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
 
 	name = uci_strdup(ctx, name);
@@ -399,8 +399,9 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
 	return 0;
 }
 
-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, const 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;
 }
@@ -428,7 +430,7 @@ int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, ch
 	return uci_del_element(ctx, e);
 }
 
-int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value, struct uci_element **result)
+int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result)
 {
 	/* NB: UCI_INTERNAL use means without history tracking */
 	bool internal = ctx->internal;
@@ -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
 	 */
-	e = uci_lookup_list(ctx, &p->sections, section);
+	e = uci_lookup_list(&p->sections, section);
 	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) {
-		e = uci_lookup_list(ctx, &s->options, option);
+		e = uci_lookup_list(&s->options, option);
 		if (!e)
 			goto notfound;
 		o = uci_to_option(e);
@@ -493,7 +495,7 @@ notfound:
 		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
 	/* now add the missing entry */
-	if (!internal && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
 	if (s) {
 		o = uci_alloc_option(s, option, value);