X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=history.c;h=c46c408c73ff4f2a0aabcc27fedec3ff3d0eb564;hp=75e3f406649e97415f42e4b1a304ad7e2574bf85;hb=c90d9cb8ba073d1c98e61591303aa96300750940;hpb=9f540f2106dcf724e4b8c41489d4bda6ccfe65d8

diff --git a/history.c b/history.c
index 75e3f40..c46c408 100644
--- a/history.c
+++ b/history.c
@@ -162,7 +162,6 @@ static int uci_parse_history(struct uci_context *ctx, FILE *stream, struct uci_p
 	int changes = 0;
 
 	/* make sure no memory from previous parse attempts is leaked */
-	ctx->internal = true;
 	uci_cleanup(ctx);
 
 	pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
@@ -187,7 +186,6 @@ error:
 	}
 
 	/* no error happened, we can get rid of the parser context now */
-	ctx->internal = true;
 	uci_cleanup(ctx);
 	return changes;
 }
@@ -219,7 +217,7 @@ static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
 	FILE *f = NULL;
 	int changes = 0;
 
-	if (!p->confdir)
+	if (!p->has_history)
 		return 0;
 
 	uci_foreach_element(&ctx->history_path, e) {
@@ -311,7 +309,6 @@ done:
 	uci_foreach_element_safe(&list, tmp, e) {
 		uci_free_element(e);
 	}
-	ctx->internal = true;
 	uci_cleanup(ctx);
 }
 
@@ -324,7 +321,7 @@ int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section,
 	UCI_ASSERT(ctx, pkg != NULL);
 	p = *pkg;
 	UCI_ASSERT(ctx, p != NULL);
-	UCI_ASSERT(ctx, p->confdir);
+	UCI_ASSERT(ctx, p->has_history);
 
 	/* 
 	 * - flush unwritten changes
@@ -368,7 +365,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	 * directly.
 	 * does not modify the uci_package pointer
 	 */
-	if (!p->confdir)
+	if (!p->has_history)
 		return uci_commit(ctx, &p, false);
 
 	if (uci_list_empty(&p->history))