X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=utils.h;h=360f9f1a8378d1b17ea6d03584ef4e64a09bbf3a;hp=b17f5f687526d1b5d7902f49a90ca2f91786787a;hb=4fe65b991edfb15a57da188698065b528e1e7e0e;hpb=c596f040369f0900e2818e249c00c44c33b6eb64 diff --git a/utils.h b/utils.h index b17f5f6..360f9f1 100644 --- a/utils.h +++ b/utils.h @@ -5,26 +5,34 @@ #include #include +struct blobmsg_list_node { + struct avl_node avl; + struct blob_attr *data; +}; + +typedef bool (*blobmsg_list_cmp)(struct blobmsg_list_node *l1, struct blobmsg_list_node *l2); + struct blobmsg_list { struct avl_tree avl; int node_offset; int node_len; -}; -struct blobmsg_list_node { - struct avl_node avl; - struct blob_attr *data; + blobmsg_list_cmp cmp; }; #define blobmsg_list_simple_init(list) \ - __blobmsg_list_init(tree, 0, sizeof(struct blobmsg_list_node)) + __blobmsg_list_init(list, 0, sizeof(struct blobmsg_list_node), NULL) + +#define blobmsg_list_init(list, type, field, cmp) \ + __blobmsg_list_init(list, offsetof(type, field), sizeof(type), cmp) -#define blobmsg_list_init(list, type, field) \ - __blobmsg_list_init(tree, offsetof(type, field), sizeof(type)) +#define blobmsg_list_for_each(list, element) \ + avl_for_each_element(&(list)->avl, element, avl) -void __blobmsg_list_init(struct blobmsg_list *list, int offset, int len); -int blobmsg_list_fill(struct blobmsg_list *list, void *data, int len); +void __blobmsg_list_init(struct blobmsg_list *list, int offset, int len, blobmsg_list_cmp cmp); +int blobmsg_list_fill(struct blobmsg_list *list, void *data, int len, bool array); void blobmsg_list_free(struct blobmsg_list *list); bool blobmsg_list_equal(struct blobmsg_list *l1, struct blobmsg_list *l2); +void blobmsg_list_move(struct blobmsg_list *list, struct blobmsg_list *src); #endif