X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=af240ce6930f259128e1531a2330495daaad3152;hp=4a06d7143adf0c989224ebf5e5d4b42c9bccd7a3;hb=6115a71b4c998bc0cc359766f99653dadc8ca431;hpb=a453ffddff2ce0c0c7fd21826bb4ae1544829553 diff --git a/libuci.c b/libuci.c index 4a06d71..af240ce 100644 --- a/libuci.c +++ b/libuci.c @@ -22,8 +22,6 @@ #include #include #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; }