fold uci_file_cleanup into uci_cleanup

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index b86c976..118289b 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -39,8 +39,10 @@ static const char *uci_errstr[] = {
        [UCI_ERR_UNKNOWN] =   "Unknown error",
 };
 
+#include "uci_internal.h"
 #include "util.c"
 #include "list.c"
+#include "history.c"
 #include "file.c"
 
 /* exported functions */
@@ -51,6 +53,7 @@ struct uci_context *uci_alloc_context(void)
        ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
        memset(ctx, 0, sizeof(struct uci_context));
        uci_list_init(&ctx->root);
+       uci_list_init(&ctx->history_path);
        ctx->flags = UCI_FLAG_STRICT;
 
        ctx->confdir = (char *) uci_confdir;
@@ -69,11 +72,15 @@ void uci_free_context(struct uci_context *ctx)
                free(ctx->savedir);
 
        UCI_TRAP_SAVE(ctx, ignore);
+       ctx->internal = true;
        uci_cleanup(ctx);
        uci_foreach_element_safe(&ctx->root, tmp, e) {
                struct uci_package *p = uci_to_package(e);
                uci_free_package(&p);
        }
+       uci_foreach_element_safe(&ctx->history_path, tmp, e) {
+               uci_free_element(e);
+       }
        free(ctx);
        UCI_TRAP_RESTORE(ctx);
 
@@ -81,28 +88,44 @@ ignore:
        return;
 }
 
-int uci_set_confdir(struct uci_context *ctx, char *dir)
+int uci_set_confdir(struct uci_context *ctx, const char *dir)
 {
-       dir = uci_strdup(ctx, dir);
+       char *cdir;
+
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, dir != NULL);
+
+       cdir = uci_strdup(ctx, dir);
        if (ctx->confdir != uci_confdir)
                free(ctx->confdir);
-       ctx->confdir = dir;
-       return 0;
-}
-
-int uci_set_savedir(struct uci_context *ctx, char *dir)
-{
-       dir = uci_strdup(ctx, dir);
-       if (ctx->savedir != uci_savedir)
-               free(ctx->savedir);
-       ctx->savedir = dir;
+       ctx->confdir = cdir;
        return 0;
 }
 
 int uci_cleanup(struct uci_context *ctx)
 {
+       struct uci_parse_context *pctx;
        UCI_HANDLE_ERR(ctx);
-       uci_file_cleanup(ctx);
+
+       if (ctx->buf) {
+               free(ctx->buf);
+               ctx->buf = NULL;
+               ctx->bufsz = 0;
+       }
+
+       pctx = ctx->pctx;
+       if (!pctx)
+               goto done;
+
+       ctx->pctx = NULL;
+       if (pctx->package)
+               uci_free_package(&pctx->package);
+
+       if (pctx->buf)
+               free(pctx->buf);
+
+       free(pctx);
+done:
        return 0;
 }