fix possible uninitialized warning from gcc 4.92

[uci.git] / list.c

diff --git a/list.c b/list.c
index cee1063079b18908c428bd106eccef451039b837..661ecc6ded8f3a334cae1eeb4ef961d4d550cd27 100644 (file)
--- a/list.c
+++ b/list.c
@@ -36,7 +36,7 @@ static inline void uci_list_fixup(struct uci_list *ptr)
  * uci_alloc_generic allocates a new uci_element with payload
  * payload is appended to the struct to save memory and reduce fragmentation
  */
-static struct uci_element *
+__private struct uci_element *
 uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 {
        struct uci_element *e;
@@ -62,7 +62,7 @@ done:
        return e;
 }
 
-static void
+__private void
 uci_free_element(struct uci_element *e)
 {
        if (e->name)
@@ -72,8 +72,7 @@ uci_free_element(struct uci_element *e)
        free(e);
 }
 
-static struct uci_option *
-uci_alloc_option(struct uci_section *s, const char *name, const char *value)
+struct uci_option *uci_alloc_option(struct uci_section *s, const char *name, const char *value)
 {
        struct uci_package *p = s->package;
        struct uci_context *ctx = p->ctx;
@@ -357,6 +356,18 @@ done:
        return e;
 }
 
+int
+uci_lookup_next(struct uci_context *ctx, struct uci_element **e, struct uci_list *list, const char *name)
+{
+       UCI_HANDLE_ERR(ctx);
+
+       *e = uci_lookup_list(list, name);
+       if (!*e)
+               UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+       return 0;
+}
+
 int
 uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended)
 {
@@ -371,7 +382,11 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
        ptr->flags |= UCI_LOOKUP_DONE;
 
        /* look up the package first */
-       e = uci_lookup_list(&ctx->root, ptr->package);
+       if (ptr->p)
+               e = &ptr->p->e;
+       else
+               e = uci_lookup_list(&ctx->root, ptr->package);
+
        if (!e) {
                UCI_INTERNAL(uci_load, ctx, ptr->package, &ptr->p);
                if (!ptr->p)
@@ -382,15 +397,21 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
                ptr->last = e;
        }
 
-       if (!ptr->section)
+       if (!ptr->section && !ptr->s)
                goto complete;
 
        /* if the section name validates as a regular name, pass through
         * to the regular uci_lookup function call */
-       if (ptr->flags & UCI_LOOKUP_EXTENDED)
-               e = uci_lookup_ext_section(ctx, ptr);
-       else
+       if (ptr->s) {
+               e = &ptr->s->e;
+       } else if (ptr->flags & UCI_LOOKUP_EXTENDED) {
+               if (extended)
+                       e = uci_lookup_ext_section(ctx, ptr);
+               else
+                       UCI_THROW(ctx, UCI_ERR_INVAL);
+       } else {
                e = uci_lookup_list(&ptr->p->sections, ptr->section);
+       }
 
        if (!e)
                goto abort;
@@ -417,8 +438,8 @@ notfound:
        return 0;
 }
 
-static struct uci_element *
-expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
+__private struct uci_element *
+uci_expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
 {
        UCI_ASSERT(ctx, ptr != NULL);
 
@@ -469,7 +490,7 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 
        UCI_HANDLE_ERR(ctx);
 
-       e = expand_ptr(ctx, ptr, true);
+       e = uci_expand_ptr(ctx, ptr, true);
        p = ptr->p;
 
        UCI_ASSERT(ctx, ptr->s);
@@ -521,6 +542,22 @@ int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *
        return 0;
 }
 
+int uci_add_named_section(struct uci_context *ctx, struct uci_package *p, const char *type, const char *name, struct uci_section **res)
+{
+       bool internal = ctx->internal;
+       struct uci_section *s;
+
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, p != NULL);
+       s = uci_alloc_section(p, type, name);
+       uci_fixup_section(ctx, s);
+       *res = s;
+       if (!internal && p->has_delta)
+               uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);
+
+       return 0;
+}
+
 int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: pass on internal flag to uci_del_element */
@@ -530,7 +567,7 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 
        UCI_HANDLE_ERR(ctx);
 
-       e = expand_ptr(ctx, ptr, true);
+       e = uci_expand_ptr(ctx, ptr, true);
        p = ptr->p;
 
        UCI_ASSERT(ctx, ptr->s);
@@ -557,7 +594,7 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 
        UCI_HANDLE_ERR(ctx);
 
-       expand_ptr(ctx, ptr, false);
+       uci_expand_ptr(ctx, ptr, false);
        UCI_ASSERT(ctx, ptr->s);
        UCI_ASSERT(ctx, ptr->value);
 
@@ -595,7 +632,7 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
        bool internal = ctx->internal;
 
        UCI_HANDLE_ERR(ctx);
-       expand_ptr(ctx, ptr, false);
+       uci_expand_ptr(ctx, ptr, false);
        UCI_ASSERT(ctx, ptr->value);
        UCI_ASSERT(ctx, ptr->s || (!ptr->option && ptr->section));
        if (!ptr->option && ptr->value[0]) {