X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=c0b4ab01571a18f2b4ed86d1bfeb38034e410e5e;hp=c6335d5d8bbfa3333de04fe8e6c52b47a2a0401f;hb=787fb6d4106cfd22485bd89d190be26e2a2c6178;hpb=8a3154a1db5078cf211c3ea76171956ba076dd76

diff --git a/libuci.c b/libuci.c
index c6335d5..c0b4ab0 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[] = {
@@ -36,54 +34,12 @@ static const char *uci_errstr[] = {
 	[UCI_ERR_UNKNOWN] =  "Unknown error",
 };
 
-
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
-{
-	void *ptr;
-
-	ptr = malloc(size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-	memset(ptr, 0, size);
-
-	return ptr;
-}
-
-/*
- * 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);
-
-	return ptr;
-}
-
-/*
- * UCI wrapper for strdup, which uses exception handling
- */
-static char *uci_strdup(struct uci_context *ctx, const char *str)
-{
-	char *ptr;
-
-	ptr = strdup(str);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-
-	return ptr;
-}
-
+#include "util.c"
 #include "list.c"
 #include "file.c"
 
-/* externally visible functions */
-
-struct uci_context *uci_alloc(void)
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
 {
 	struct uci_context *ctx;
 
@@ -94,15 +50,19 @@ struct uci_context *uci_alloc(void)
 	return ctx;
 }
 
-void uci_free(struct uci_context *ctx)
+void uci_free_context(struct uci_context *ctx)
 {
-	struct uci_package *package;
+	struct uci_element *e, *tmp;
 
+	UCI_TRAP_SAVE(ctx, ignore);
 	uci_cleanup(ctx);
-	uci_foreach_entry(package, &ctx->root, package) {
-		uci_drop_config(package);
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		uci_free_package(uci_to_package(e));
 	}
 	free(ctx);
+	UCI_TRAP_RESTORE(ctx);
+
+ignore:
 	return;
 }
 
@@ -113,7 +73,7 @@ int uci_cleanup(struct uci_context *ctx)
 	return 0;
 }
 
-void uci_perror(struct uci_context *ctx, const char *str)
+void uci_perror(struct uci_context *ctx, const char *prefix)
 {
 	int err;
 
@@ -125,15 +85,20 @@ void uci_perror(struct uci_context *ctx, const char *str)
 	if ((err < 0) || (err >= UCI_ERR_LAST))
 		err = UCI_ERR_UNKNOWN;
 
+	if (prefix)
+		fprintf(stderr, "%s: ", prefix);
+	if (ctx->func)
+		fprintf(stderr, "%s: ", ctx->func);
+
 	switch (err) {
 	case UCI_ERR_PARSE:
 		if (ctx->pctx) {
-			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);
+			fprintf(stderr, "%s (%s) at line %d, byte %d\n", uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
 			break;
 		}
 		/* fall through */
 	default:
-		fprintf(stderr, "%s: %s\n", str, uci_errstr[err]);
+		fprintf(stderr, "%s\n", uci_errstr[err]);
 		break;
 	}
 }