blobmsg_json: simplify add_separator and fix thread-safety

[project/libubox.git] / kvlist.h

diff --git a/kvlist.h b/kvlist.h
index 339cc1d..0d35b46 100644 (file)
--- a/kvlist.h
+++ b/kvlist.h
@@ -23,7 +23,7 @@
 struct kvlist {
        struct avl_tree avl;
 
-       int (*get_len)(struct kvlist *kv, void *data);
+       int (*get_len)(struct kvlist *kv, const void *data);
 };
 
 struct kvlist_node {
@@ -37,18 +37,18 @@ struct kvlist_node {
 
 #define kvlist_for_each(kv, name, value) \
        for (value = (void *) __avl_list_to_kv((kv)->avl.list_head.next)->data,                 \
-            name = (const char *) __ptr_to_kv(value)->avl.key;                                 \
+            name = (const char *) __ptr_to_kv(value)->avl.key, (void) name;                    \
             &__ptr_to_kv(value)->avl.list != &(kv)->avl.list_head;                             \
             value = (void *) (__avl_list_to_kv(__ptr_to_kv(value)->avl.list.next))->data,      \
             name = (const char *) __ptr_to_kv(value)->avl.key)
 
-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));
 void kvlist_free(struct kvlist *kv);
 void *kvlist_get(struct kvlist *kv, const char *name);
-void kvlist_set(struct kvlist *kv, const char *name, void *data);
+void kvlist_set(struct kvlist *kv, const char *name, const void *data);
 bool kvlist_delete(struct kvlist *kv, const char *name);
 
-int kvlist_strlen(struct kvlist *kv, void *data);
-int kvlist_blob_len(struct kvlist *kv, void *data);
+int kvlist_strlen(struct kvlist *kv, const void *data);
+int kvlist_blob_len(struct kvlist *kv, const void *data);
 
 #endif