X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=cbb57759978e544b23d47694cc59dc202779dd71;hp=d71a8f7489f411a38c164c047efe770f6978d0ee;hb=1b48b50c9669ecf3fdd3f50d662fbfd18b971014;hpb=504b87e64062fc52fdedea4e35bb03467c8bf97f diff --git a/utils.h b/utils.h index d71a8f7..cbb5775 100644 --- a/utils.h +++ b/utils.h @@ -4,16 +4,6 @@ #include #include -#ifdef DEBUG -#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__) -#else -#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__) -#endif - -static inline void no_debug(const char *fmt, ...) -{ -} - #define __init __attribute__((constructor)) struct vlist_tree; @@ -29,6 +19,7 @@ struct vlist_tree { vlist_update_cb update; int key_offset; bool keep_old; + bool no_delete; int version; }; @@ -43,6 +34,14 @@ void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb up #define vlist_init(tree, cmp, update, type, node, key) \ __vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node)) +#define vlist_find(tree, name, element, node_member) \ + avl_find_element(&(tree)->avl, name, element, node_member.avl) + +static inline void vlist_update(struct vlist_tree *tree) +{ + tree->version++; +} + void vlist_add(struct vlist_tree *tree, struct vlist_node *node); void vlist_delete(struct vlist_tree *tree, struct vlist_node *node); void vlist_flush(struct vlist_tree *tree);