more cleanup

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 59e2ea96c42fd4dcf1fabe3b2b5df2e35f6b4390..1cfe4ec87e6cd2aafe79f0e95f7c4c033d878dfd 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -56,7 +56,7 @@ struct uci_context *uci_alloc_context(void)
        uci_list_init(&ctx->root);
        uci_list_init(&ctx->history_path);
        uci_list_init(&ctx->backends);
-       ctx->flags = UCI_FLAG_STRICT;
+       ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY;
 
        ctx->confdir = (char *) uci_confdir;
        ctx->savedir = (char *) uci_savedir;
@@ -85,8 +85,8 @@ void uci_free_context(struct uci_context *ctx)
        uci_foreach_element_safe(&ctx->history_path, tmp, e) {
                uci_free_element(e);
        }
-       free(ctx);
        UCI_TRAP_RESTORE(ctx);
+       free(ctx);
 
 ignore:
        return;
@@ -137,7 +137,7 @@ void uci_perror(struct uci_context *ctx, const char *prefix)
        if (!ctx)
                err = UCI_ERR_INVAL;
        else
-               err = ctx->errno;
+               err = ctx->err;
 
        if ((err < 0) || (err >= UCI_ERR_LAST))
                err = UCI_ERR_UNKNOWN;