uloop: allow specifying a timeout for uloop_run()

[project/libubox.git] / kvlist.c

diff --git a/kvlist.c b/kvlist.c
index 4f56a38..a7b6ea0 100644 (file)
--- a/kvlist.c
+++ b/kvlist.c
@@ -24,17 +24,17 @@
 
 #include "kvlist.h"
 
-int kvlist_strlen(struct kvlist *kv, void *data)
+int kvlist_strlen(struct kvlist *kv, const void *data)
 {
        return strlen(data) + 1;
 }
 
-int kvlist_blob_len(struct kvlist *kv, void *data)
+int kvlist_blob_len(struct kvlist *kv, const void *data)
 {
        return blob_pad_len(data);
 }
 
-void kvlist_init(struct kvlist *kv, int (*get_len)(struct kvlist *kv, void *data))
+void kvlist_init(struct kvlist *kv, int (*get_len)(struct kvlist *kv, const void *data))
 {
        avl_init(&kv->avl, avl_strcmp, false, NULL);
        kv->get_len = get_len;
@@ -71,20 +71,25 @@ bool kvlist_delete(struct kvlist *kv, const char *name)
        return !!node;
 }
 
-void kvlist_set(struct kvlist *kv, const char *name, void *data)
+bool kvlist_set(struct kvlist *kv, const char *name, const void *data)
 {
        struct kvlist_node *node;
        char *name_buf;
        int len = kv->get_len(kv, data);
 
-       kvlist_delete(kv, name);
-
        node = calloc_a(sizeof(struct kvlist_node) + len,
                &name_buf, strlen(name) + 1);
+       if (!node)
+               return false;
+
+       kvlist_delete(kv, name);
+
        memcpy(node->data, data, len);
 
        node->avl.key = strcpy(name_buf, name);
        avl_insert(&kv->avl, &node->avl);
+
+       return true;
 }
 
 void kvlist_free(struct kvlist *kv)