cli code cleanup

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index fb5e686..b644523 100644 (file)
--- a/list.c
+++ b/list.c
@@ -102,6 +102,9 @@ uci_alloc_option(struct uci_section *s, const char *name, const char *value)
 static inline void
 uci_free_option(struct uci_option *o)
 {
+       if ((o->value != uci_dataptr(o)) &&
+               (o->value != NULL))
+               free(o->value);
        uci_free_element(&o->e);
 }
 
@@ -135,9 +138,50 @@ uci_free_section(struct uci_section *s)
        uci_foreach_element_safe(&s->options, tmp, o) {
                uci_free_option(uci_to_option(o));
        }
+       if ((s->type != uci_dataptr(s)) &&
+               (s->type != NULL))
+               free(s->type);
        uci_free_element(&s->e);
 }
 
+/* record a change that was done to a package */
+static void
+uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
+{
+       struct uci_history *h;
+       int size = strlen(section) + 1;
+       char *ptr;
+
+       if (!p->confdir)
+               return;
+
+       if (value)
+               size += strlen(section) + 1;
+
+       h = uci_alloc_element(ctx, history, option, size);
+       ptr = uci_dataptr(h);
+       h->cmd = cmd;
+       h->section = strcpy(ptr, section);
+       if (value) {
+               ptr += strlen(ptr) + 1;
+               h->value = strcpy(ptr, value);
+       }
+       uci_list_add(&p->history, &h->e.list);
+}
+
+static void
+uci_free_history(struct uci_history *h)
+{
+       if (!h)
+               return;
+       if ((h->section != NULL) &&
+               (h->section != uci_dataptr(h))) {
+               free(h->section);
+               free(h->value);
+       }
+       uci_free_element(&h->e);
+}
+
 static struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
@@ -151,9 +195,10 @@ uci_alloc_package(struct uci_context *ctx, const char *name)
 }
 
 static void
-uci_free_package(struct uci_package *p)
+uci_free_package(struct uci_package **package)
 {
        struct uci_element *e, *tmp;
+       struct uci_package *p = *package;
 
        if(!p)
                return;
@@ -163,29 +208,11 @@ uci_free_package(struct uci_package *p)
        uci_foreach_element_safe(&p->sections, tmp, e) {
                uci_free_section(uci_to_section(e));
        }
-       uci_free_element(&p->e);
-}
-
-/* record a change that was done to a package */
-static inline void
-uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
-{
-       struct uci_history *h;
-       int size = strlen(section) + 1;
-       char *ptr;
-
-       if (value)
-               size += strlen(section) + 1;
-
-       h = uci_alloc_element(ctx, history, option, size);
-       ptr = uci_dataptr(h);
-       h->cmd = cmd;
-       h->section = strcpy(ptr, section);
-       if (value) {
-               ptr += strlen(ptr) + 1;
-               h->value = strcpy(ptr, value);
+       uci_foreach_element_safe(&p->history, tmp, e) {
+               uci_free_history(uci_to_history(e));
        }
-       uci_list_add(&p->history, &h->e.list);
+       uci_free_element(&p->e);
+       *package = NULL;
 }
 
 static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
@@ -229,6 +256,7 @@ notfound:
 
 int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 {
+       /* NB: UCI_INTERNAL use means without history tracking */
        bool internal = ctx->internal;
        struct uci_package *p = NULL;
        struct uci_section *s = NULL;
@@ -276,6 +304,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 
 int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
 {
+       /* NB: UCI_INTERNAL use means without history tracking */
        bool internal = ctx->internal;
        struct uci_list *list;
        struct uci_element *e;
@@ -345,6 +374,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 
 int uci_del(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
 {
+       /* NB: pass on internal flag to uci_del_element */
        bool internal = ctx->internal;
        struct uci_element *e;
        struct uci_section *s = NULL;
@@ -365,6 +395,7 @@ int uci_del(struct uci_context *ctx, struct uci_package *p, char *section, char
 
 int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)
 {
+       /* NB: UCI_INTERNAL use means without history tracking */
        bool internal = ctx->internal;
        struct uci_element *e = NULL;
        struct uci_section *s = NULL;
@@ -381,7 +412,10 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
         * if the section/option is to be modified and it is not found
         * create a new element in the appropriate list
         */
-       UCI_INTERNAL(uci_lookup, ctx, &e, p, section, NULL);
+       e = uci_lookup_list(ctx, &p->sections, section);
+       if (!e)
+               goto notfound;
+
        s = uci_to_section(e);
        if (option) {
                e = uci_lookup_list(ctx, &s->options, option);
@@ -433,7 +467,7 @@ int uci_unload(struct uci_context *ctx, struct uci_package *p)
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, p != NULL);
 
-       uci_free_package(p);
+       uci_free_package(&p);
        return 0;
 }