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 cb0bc36..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 "list.c"

-#include "parse.c"
+#include "file.c"

 
 /* externally visible functions */
 
 
 /* externally visible functions */
 


@@ -94,10 +94,22 @@ struct uci_context *uci_alloc(void)
        return ctx;
 }
 
        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);
 int uci_cleanup(struct uci_context *ctx)
 {
        UCI_HANDLE_ERR(ctx);

-       uci_parse_cleanup(ctx);
+       uci_file_cleanup(ctx);

        return 0;
 }
 
        return 0;
 }