projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils: use constant byte-order conversion
[project/libubox.git]
/
kvlist.h
diff --git
a/kvlist.h
b/kvlist.h
index
a4e1b1d
..
eaa691c
100644
(file)
--- a/
kvlist.h
+++ b/
kvlist.h
@@
-18,12
+18,13
@@
#ifndef __LIBUBOX_KVLIST_H
#define __LIBUBOX_KVLIST_H
#ifndef __LIBUBOX_KVLIST_H
#define __LIBUBOX_KVLIST_H
+#include "avl-cmp.h"
#include "avl.h"
struct kvlist {
struct avl_tree avl;
#include "avl.h"
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 {
};
struct kvlist_node {
@@
-32,6
+33,15
@@
struct kvlist_node {
char data[0] __attribute__((aligned(4)));
};
char data[0] __attribute__((aligned(4)));
};
+#define KVLIST_INIT(_name, _get_len) \
+ { \
+ .avl = AVL_TREE_INIT(_name.avl, avl_strcmp, false, NULL), \
+ .get_len = _get_len \
+ }
+
+#define KVLIST(_name, _get_len) \
+ struct kvlist _name = KVLIST_INIT(_name, _get_len)
+
#define __ptr_to_kv(_ptr) container_of(((char *) (_ptr)), struct kvlist_node, data[0])
#define __avl_list_to_kv(_l) container_of(_l, struct kvlist_node, avl.list)
#define __ptr_to_kv(_ptr) container_of(((char *) (_ptr)), struct kvlist_node, data[0])
#define __avl_list_to_kv(_l) container_of(_l, struct kvlist_node, avl.list)
@@
-42,13
+52,13
@@
struct kvlist_node {
value = (void *) (__avl_list_to_kv(__ptr_to_kv(value)->avl.list.next))->data, \
name = (const char *) __ptr_to_kv(value)->avl.key)
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_free(struct kvlist *kv);
void *kvlist_get(struct kvlist *kv, const char *name);
-
void kvlist_set(struct kvlist *kv, const char *name,
void *data);
+
bool kvlist_set(struct kvlist *kv, const char *name, const
void *data);
bool kvlist_delete(struct kvlist *kv, const char *name);
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
#endif