projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert interface event queueing to global interface notifier
[project/netifd.git]
/
utils.h
diff --git
a/utils.h
b/utils.h
index
b5ae7e0
..
5ea9c6f
100644
(file)
--- a/
utils.h
+++ b/
utils.h
@@
-3,6
+3,26
@@
#include <libubox/list.h>
#include <libubox/avl.h>
#include <libubox/list.h>
#include <libubox/avl.h>
+#include <libubox/blobmsg.h>
+
+#ifndef __OPTIMIZE__
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#else
+extern int __build_bug_on_failed;
+#define BUILD_BUG_ON(condition) \
+ do { \
+ ((void)sizeof(char[1 - 2*!!(condition)])); \
+ if (condition) __build_bug_on_failed = 1; \
+ } while(0)
+#endif
+
+static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
+{
+ if (!attr)
+ return val;
+
+ return blobmsg_get_bool(attr);
+}
#define __init __attribute__((constructor))
#define __init __attribute__((constructor))
@@
-17,7
+37,6
@@
struct vlist_tree {
struct avl_tree avl;
vlist_update_cb update;
struct avl_tree avl;
vlist_update_cb update;
- int key_offset;
bool keep_old;
bool no_delete;
bool keep_old;
bool no_delete;
@@
-29,10
+48,7
@@
struct vlist_node {
int version;
};
int version;
};
-void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
-
-#define vlist_init(tree, cmp, update, type, node, key) \
- __vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
#define vlist_find(tree, name, element, node_member) \
avl_find_element(&(tree)->avl, name, element, node_member.avl)
#define vlist_find(tree, name, element, node_member) \
avl_find_element(&(tree)->avl, name, element, node_member.avl)
@@
-42,7
+58,7
@@
static inline void vlist_update(struct vlist_tree *tree)
tree->version++;
}
tree->version++;
}
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
+void vlist_add(struct vlist_tree *tree, struct vlist_node *node
, void *key
);
void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
void vlist_flush(struct vlist_tree *tree);
void vlist_flush_all(struct vlist_tree *tree);
void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
void vlist_flush(struct vlist_tree *tree);
void vlist_flush_all(struct vlist_tree *tree);
@@
-77,6
+93,7
@@
static inline void vlist_simple_update(struct vlist_simple_tree *tree)
static inline void vlist_simple_add(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
{
static inline void vlist_simple_add(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
{
+ node->version = tree->version;
list_add(&node->list, &tree->list);
}
list_add(&node->list, &tree->list);
}