fix a really stupid bug

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 7a703b2..b20ee71 100644 (file)
--- a/list.c
+++ b/list.c
@@ -74,7 +74,7 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 
 error:
        free(ptr);
-       UCI_THROW(ctx, ctx->errno);
+       UCI_THROW(ctx, ctx->err);
 
 done:
        return e;
@@ -228,7 +228,7 @@ static struct uci_element *uci_lookup_list(struct uci_list *list, const char *na
        return NULL;
 }
 
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, const char *section, const char *option)
 {
        struct uci_element *e;
        struct uci_section *s;
@@ -307,7 +307,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
        return 0;
 }
 
-int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value)
 {
        /* NB: UCI_INTERNAL use means without history tracking */
        bool internal = ctx->internal;
@@ -315,6 +315,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
        struct uci_element *e;
        struct uci_package *p;
        struct uci_section *s;
+       struct uci_option *o;
        char *section;
        char *option;
        char *str;
@@ -341,13 +342,20 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
                s = uci_to_section(e);
                section = e->name;
                option = NULL;
+               /* matches the currently set value */
+               if (!strcmp(value, s->type))
+                       return 0;
                break;
        case UCI_TYPE_OPTION:
                UCI_ASSERT(ctx, value != NULL);
                size = sizeof(struct uci_option);
-               s = uci_to_option(e)->section;
+               o = uci_to_option(e);
+               s = o->section;
                section = s->e.name;
-               option = e->name;
+               option = o->e.name;
+               /* matches the currently set value */
+               if (!strcmp(value, o->value))
+                       return 0;
                break;
        default:
                UCI_THROW(ctx, UCI_ERR_INVAL);
@@ -399,7 +407,7 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
        return 0;
 }
 
-int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
 {
        bool internal = ctx->internal;
        struct uci_section *s;
@@ -415,7 +423,7 @@ int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type,
        return 0;
 }
 
-int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
+int uci_delete(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option)
 {
        /* NB: pass on internal flag to uci_del_element */
        bool internal = ctx->internal;
@@ -430,7 +438,7 @@ int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, ch
        return uci_del_element(ctx, e);
 }
 
-int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value, struct uci_element **result)
+int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result)
 {
        /* NB: UCI_INTERNAL use means without history tracking */
        bool internal = ctx->internal;