X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=kvlist.c;h=a7b6ea07240eed51769d79d1a59c8b424ec65eea;hp=4f56a3883d03ea6100e262c14bc047a268b128ef;hb=42a8ecd8587055fba686243a902a212915493900;hpb=d4b56b09403e6bf802633c447a3877eefb6ff41c

diff --git a/kvlist.c b/kvlist.c
index 4f56a38..a7b6ea0 100644
--- 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)