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 1902673..92205e8 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -79,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 */
 
@@ -96,11 +96,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_file(cfg);
+       uci_foreach_element_safe(&ctx->root, tmp, e) {
+               uci_free_package(uci_to_package(e));
        }
        free(ctx);
        return;
@@ -109,7 +109,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;
 }