X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libuci.c;h=af240ce6930f259128e1531a2330495daaad3152;hb=28bce261b2b5139fe6ccaba4358b73fcccf8097b;hp=262ca698c5f68753ecd68a4e6a156e1e50e295ec;hpb=f57d582f15c0ead3b600cb999ca298390957f597;p=project%2Fuci.git

diff --git a/libuci.c b/libuci.c
index 262ca69..af240ce 100644
--- a/libuci.c
+++ b/libuci.c
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "uci.h"
-
-#define DEBUG
 #include "err.h"
 
 static const char *uci_errstr[] = {
@@ -79,7 +77,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 +92,22 @@ struct uci_context *uci_alloc(void)
 	return ctx;
 }
 
+void uci_free(struct uci_context *ctx)
+{
+	struct uci_element *e, *tmp;
+
+	uci_cleanup(ctx);
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		uci_free_package(uci_to_package(e));
+	}
+	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 +126,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 */