X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=47c815a4e9e68480399aaf7e2b63b49ee70e07a3;hp=262ca698c5f68753ecd68a4e6a156e1e50e295ec;hb=9487b850844e4fb873b90cf357c2d0367ebc065c;hpb=f57d582f15c0ead3b600cb999ca298390957f597

diff --git a/libuci.c b/libuci.c
index 262ca69..47c815a 100644
--- a/libuci.c
+++ b/libuci.c
@@ -79,7 +79,7 @@ static char *uci_strdup(struct uci_context *ctx, const char *str)
 }
 
 #include "list.c"
-#include "parse.c"
+#include "file.c"
 
 /* externally visible functions */
 
@@ -94,10 +94,22 @@ struct uci_context *uci_alloc(void)
 	return ctx;
 }
 
+void uci_free(struct uci_context *ctx)
+{
+	struct uci_config *cfg;
+
+	uci_cleanup(ctx);
+	uci_foreach_entry(config, &ctx->root, cfg) {
+		uci_drop_config(cfg);
+	}
+	free(ctx);
+	return;
+}
+
 int uci_cleanup(struct uci_context *ctx)
 {
 	UCI_HANDLE_ERR(ctx);
-	uci_parse_cleanup(ctx);
+	uci_file_cleanup(ctx);
 	return 0;
 }
 
@@ -116,7 +128,7 @@ void uci_perror(struct uci_context *ctx, const char *str)
 	switch (err) {
 	case UCI_ERR_PARSE:
 		if (ctx->pctx) {
-			fprintf(stderr, "%s: %s at line %d, byte %d\n", str, uci_errstr[err], ctx->pctx->line, ctx->pctx->byte);
+			fprintf(stderr, "%s: %s (%s) at line %d, byte %d\n", str, uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
 			break;
 		}
 		/* fall through */