major code refactoring for more code reuse and smaller code size

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 4dfffff..92205e8 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "libuci.h"
+#include "uci.h"
 
 #define DEBUG
 #include "err.h"
@@ -31,6 +31,7 @@ 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",
 };
@@ -78,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 */
 
@@ -93,10 +94,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;
 }
 
@@ -115,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 */