X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=0d00f81b424bc6985360c4c3528b6f2781ee8051;hp=f3a9ed6fa8566a8b30f83bbf61ba371b42ade08c;hb=37930de695fbf183cd9eef8b33e428921efa7cc8;hpb=b42ee8f21842fab41a4cdf27960000bb1b3f42a7

diff --git a/list.c b/list.c
index f3a9ed6..0d00f81 100644
--- a/list.c
+++ b/list.c
@@ -33,7 +33,7 @@ static inline void uci_list_fixup(struct uci_list *ptr)
 	ptr->next->prev = ptr;
 }
 
-/* 
+/*
  * uci_alloc_generic allocates a new uci_element with payload
  * payload is appended to the struct to save memory and reduce fragmentation
  */
@@ -66,8 +66,7 @@ done:
 __private void
 uci_free_element(struct uci_element *e)
 {
-	if (e->name)
-		free(e->name);
+	free(e->name);
 	if (!uci_list_empty(&e->list))
 		uci_list_del(&e->list);
 	free(e);
@@ -239,8 +238,7 @@ uci_free_package(struct uci_package **package)
 	if(!p)
 		return;
 
-	if (p->path)
-		free(p->path);
+	free(p->path);
 	uci_foreach_element_safe(&p->sections, tmp, e) {
 		uci_free_section(uci_to_section(e));
 	}
@@ -320,7 +318,7 @@ uci_lookup_ext_section(struct uci_context *ctx, struct uci_ptr *ptr)
 	else if (!uci_validate_type(name))
 		goto error;
 
-	/* if the given index is negative, it specifies the section number from 
+	/* if the given index is negative, it specifies the section number from
 	 * the end of the list */
 	if (idx < 0) {
 		c = 0;
@@ -348,7 +346,7 @@ uci_lookup_ext_section(struct uci_context *ctx, struct uci_ptr *ptr)
 	goto done;
 
 error:
-	e = NULL;
+	free(section);
 	memset(ptr, 0, sizeof(struct uci_ptr));
 	UCI_THROW(ctx, UCI_ERR_INVAL);
 done:
@@ -502,8 +500,7 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 		uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
 
 	n = uci_strdup(ctx, ptr->value);
-	if (e->name)
-		free(e->name);
+	free(e->name);
 	e->name = n;
 
 	if (e->type == UCI_TYPE_SECTION)
@@ -515,12 +512,13 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 {
 	struct uci_package *p = s->package;
+	bool internal = ctx && ctx->internal;
 	char order[32];
 
 	UCI_HANDLE_ERR(ctx);
 
 	uci_list_set_pos(&s->package->sections, &s->e.list, pos);
-	if (!ctx->internal && p->has_delta) {
+	if (!internal && p->has_delta) {
 		sprintf(order, "%d", pos);
 		uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
 	}
@@ -559,7 +557,7 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 
 	UCI_ASSERT(ctx, ptr->s);
 
-	if (ptr->value && *ptr->value && ptr->o && ptr->o->type == UCI_TYPE_LIST) {
+	if (ptr->o && ptr->o->type == UCI_TYPE_LIST && ptr->value && *ptr->value) {
 		if (!sscanf(ptr->value, "%d", &index))
 			return 1;