X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=92205e8a0492d995352549b432f961c36701f7e9;hp=190267354dc675b6b92bd33947c2f40ac0679a83;hb=8f5a6c07caaaf5bd692623d1ed8ffbfa20f564d8;hpb=99981540182c29049e971a3cb9a772d7f107b2ab diff --git a/libuci.c b/libuci.c index 1902673..92205e8 100644 --- 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; }