X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=400acd8967de5ada548b46fd2d6776f79bd3a665;hp=c3a8fc06f6a0127999613d6b943415600d3e2ecc;hb=8ea07e430df35634c09dc63d8c0cb644522bbe69;hpb=4535c379ced2bdb6a4b414f71080fa0c6f5180aa

diff --git a/libuci.c b/libuci.c
index c3a8fc0..400acd8 100644
--- a/libuci.c
+++ b/libuci.c
@@ -21,9 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "libuci.h"
-
-#define DEBUG
+#include "uci.h"
 #include "err.h"
 
 static const char *uci_errstr[] = {
@@ -31,57 +29,47 @@ static const char *uci_errstr[] = {
 	[UCI_ERR_MEM] =      "Out of memory",
 	[UCI_ERR_INVAL] =    "Invalid argument",
 	[UCI_ERR_NOTFOUND] = "Entry not found",
+	[UCI_ERR_IO] =       "I/O error",
 	[UCI_ERR_PARSE] =    "Parse error",
 	[UCI_ERR_UNKNOWN] =  "Unknown error",
 };
 
+#include "util.c"
+#include "list.c"
+#include "file.c"
 
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
 {
-	void *ptr;
-	
-	ptr = malloc(size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-	memset(ptr, 0, size);
-
-	return ptr;
-}
+	struct uci_context *ctx;
 
-/*
- * UCI wrapper for realloc, which uses exception handling
- */
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
-{
-	ptr = realloc(ptr, size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
+	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
+	memset(ctx, 0, sizeof(struct uci_context));
+	uci_list_init(&ctx->root);
 
-	return ptr;
+	return ctx;
 }
 
-#include "list.c"
-#include "parse.c"
+void uci_free_context(struct uci_context *ctx)
+{
+	struct uci_element *e, *tmp;
 
-/* externally visible functions */
+	UCI_TRAP_SAVE(ctx, ignore);
+	uci_cleanup(ctx);
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		uci_free_package(uci_to_package(e));
+	}
+	free(ctx);
+	UCI_TRAP_RESTORE(ctx);
 
-struct uci_context *uci_alloc(void)
-{
-	struct uci_context *ctx;
-	
-	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
-	memset(ctx, 0, sizeof(struct uci_context));
-	
-	return ctx;
+ignore:
+	return;
 }
 
 int uci_cleanup(struct uci_context *ctx)
 {
 	UCI_HANDLE_ERR(ctx);
-	uci_parse_cleanup(ctx);
+	uci_file_cleanup(ctx);
 	return 0;
 }
 
@@ -93,14 +81,14 @@ void uci_perror(struct uci_context *ctx, const char *str)
 		err = UCI_ERR_INVAL;
 	else
 		err = ctx->errno;
-	
+
 	if ((err < 0) || (err >= UCI_ERR_LAST))
 		err = UCI_ERR_UNKNOWN;
 
 	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 */