X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=delta.c;h=73c2728893009fd49cbdffb0be00eecf6f0f76ee;hp=50efc07d3cd82b2d6ab3ae6da1ae6a78aa177753;hb=be457b5263f1f0504e50c241c18e21bb340cef7e;hpb=07d6fd66f6a20e35490bc8b55d26fdb389016120

diff --git a/delta.c b/delta.c
index 50efc07..73c2728 100644
--- a/delta.c
+++ b/delta.c
@@ -282,8 +282,7 @@ __private int uci_load_delta(struct uci_context *ctx, struct uci_package *p, boo
 			UCI_THROW(ctx, UCI_ERR_IO);
 		}
 	}
-	if (filename)
-		free(filename);
+	free(filename);
 	uci_close_stream(f);
 	ctx->err = 0;
 	return changes;
@@ -317,8 +316,8 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
 		if (!buf[0])
 			continue;
 
-		/* NB: need to allocate the element before the call to 
-		 * uci_parse_delta_tuple, otherwise the original string 
+		/* NB: need to allocate the element before the call to
+		 * uci_parse_delta_tuple, otherwise the original string
 		 * gets modified before it is saved */
 		e = uci_alloc_generic(ctx, UCI_TYPE_DELTA, pctx->buf, sizeof(struct uci_element));
 		uci_list_add(&list, &e->list);
@@ -347,8 +346,7 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
 	UCI_TRAP_RESTORE(ctx);
 
 done:
-	if (filename)
-		free(filename);
+	free(filename);
 	uci_close_stream(pctx->file);
 	uci_foreach_element_safe(&list, tmp, e) {
 		uci_free_element(e);
@@ -366,7 +364,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	uci_expand_ptr(ctx, ptr, false);
 	UCI_ASSERT(ctx, ptr->p->has_delta);
 
-	/* 
+	/*
 	 * - flush unwritten changes
 	 * - save the package name
 	 * - unload the package
@@ -376,7 +374,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	UCI_TRAP_SAVE(ctx, error);
 	UCI_INTERNAL(uci_save, ctx, ptr->p);
 
-	/* NB: need to clone package, section and option names, 
+	/* NB: need to clone package, section and option names,
 	 * as they may get freed on uci_free_package() */
 	package = uci_strdup(ctx, ptr->p->e.name);
 	if (ptr->section)
@@ -392,12 +390,9 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	ctx->err = 0;
 
 error:
-	if (package)
-		free(package);
-	if (section)
-		free(section);
-	if (option)
-		free(option);
+	free(package);
+	free(section);
+	free(option);
 	if (ctx->err)
 		UCI_THROW(ctx, ctx->err);
 	return 0;
@@ -413,7 +408,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, p != NULL);
 
-	/* 
+	/*
 	 * if the config file was outside of the /etc/config path,
 	 * don't save the delta to a file, update the real file
 	 * directly.
@@ -483,8 +478,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
 done:
 	uci_close_stream(f);
-	if (filename)
-		free(filename);
+	free(filename);
 	if (ctx->err)
 		UCI_THROW(ctx, ctx->err);