improved debugging

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 4a06d71..af240ce 100644 (file)
--- 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[] = {
@@ -96,11 +94,11 @@ struct uci_context *uci_alloc(void)
 
 void uci_free(struct uci_context *ctx)
 {
-       struct uci_config *cfg;
+       struct uci_element *e, *tmp;
 
        uci_cleanup(ctx);
-       uci_foreach_entry(config, &ctx->root, cfg) {
-               uci_drop_config(cfg);
+       uci_foreach_element_safe(&ctx->root, tmp, e) {
+               uci_free_package(uci_to_package(e));
        }
        free(ctx);
        return;
@@ -109,7 +107,7 @@ void uci_free(struct uci_context *ctx)
 int uci_cleanup(struct uci_context *ctx)
 {
        UCI_HANDLE_ERR(ctx);
-       uci_parse_cleanup(ctx);
+       uci_file_cleanup(ctx);
        return 0;
 }