From 44d11498479a08f46a64431d60ed19d4aba94dad Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 7 Sep 2015 18:57:50 +0200 Subject: src: get rid of _attr_ infix in new nftnl_ definitions The function names are already large, trim off the _ATTR_ infix in the attribute definitions. Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/set.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'include/libnftnl/set.h') diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h index bee8dfa..11243f5 100644 --- a/include/libnftnl/set.h +++ b/include/libnftnl/set.h @@ -33,21 +33,21 @@ void nftnl_set_free(struct nftnl_set *s); struct nftnl_set *nftnl_set_clone(const struct nftnl_set *set); -bool nftnl_set_attr_is_set(const struct nftnl_set *s, uint16_t attr); -void nftnl_set_attr_unset(struct nftnl_set *s, uint16_t attr); -void nftnl_set_attr_set(struct nftnl_set *s, uint16_t attr, const void *data); -void nftnl_set_attr_set_data(struct nftnl_set *s, uint16_t attr, const void *data, +bool nftnl_set_is_set(const struct nftnl_set *s, uint16_t attr); +void nftnl_set_unset(struct nftnl_set *s, uint16_t attr); +void nftnl_set_set(struct nftnl_set *s, uint16_t attr, const void *data); +void nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, uint32_t data_len); -void nftnl_set_attr_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val); -void nftnl_set_attr_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val); -void nftnl_set_attr_set_str(struct nftnl_set *s, uint16_t attr, const char *str); +void nftnl_set_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val); +void nftnl_set_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val); +void nftnl_set_set_str(struct nftnl_set *s, uint16_t attr, const char *str); -const void *nftnl_set_attr_get(struct nftnl_set *s, uint16_t attr); -const void *nftnl_set_attr_get_data(struct nftnl_set *s, uint16_t attr, +const void *nftnl_set_get(struct nftnl_set *s, uint16_t attr); +const void *nftnl_set_get_data(struct nftnl_set *s, uint16_t attr, uint32_t *data_len); -const char *nftnl_set_attr_get_str(struct nftnl_set *s, uint16_t attr); -uint32_t nftnl_set_attr_get_u32(struct nftnl_set *s, uint16_t attr); -uint64_t nftnl_set_attr_get_u64(struct nftnl_set *s, uint16_t attr); +const char *nftnl_set_get_str(struct nftnl_set *s, uint16_t attr); +uint32_t nftnl_set_get_u32(struct nftnl_set *s, uint16_t attr); +uint64_t nftnl_set_get_u64(struct nftnl_set *s, uint16_t attr); struct nlmsghdr; @@ -105,18 +105,18 @@ struct nftnl_set_elem *nftnl_set_elem_clone(struct nftnl_set_elem *elem); void nftnl_set_elem_add(struct nftnl_set *s, struct nftnl_set_elem *elem); -void nftnl_set_elem_attr_unset(struct nftnl_set_elem *s, uint16_t attr); -void nftnl_set_elem_attr_set(struct nftnl_set_elem *s, uint16_t attr, const void *data, uint32_t data_len); -void nftnl_set_elem_attr_set_u32(struct nftnl_set_elem *s, uint16_t attr, uint32_t val); -void nftnl_set_elem_attr_set_u64(struct nftnl_set_elem *s, uint16_t attr, uint64_t val); -void nftnl_set_elem_attr_set_str(struct nftnl_set_elem *s, uint16_t attr, const char *str); +void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr); +void nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, const void *data, uint32_t data_len); +void nftnl_set_elem_set_u32(struct nftnl_set_elem *s, uint16_t attr, uint32_t val); +void nftnl_set_elem_set_u64(struct nftnl_set_elem *s, uint16_t attr, uint64_t val); +void nftnl_set_elem_set_str(struct nftnl_set_elem *s, uint16_t attr, const char *str); -const void *nftnl_set_elem_attr_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t *data_len); -const char *nftnl_set_elem_attr_get_str(struct nftnl_set_elem *s, uint16_t attr); -uint32_t nftnl_set_elem_attr_get_u32(struct nftnl_set_elem *s, uint16_t attr); -uint64_t nftnl_set_elem_attr_get_u64(struct nftnl_set_elem *s, uint16_t attr); +const void *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t *data_len); +const char *nftnl_set_elem_get_str(struct nftnl_set_elem *s, uint16_t attr); +uint32_t nftnl_set_elem_get_u32(struct nftnl_set_elem *s, uint16_t attr); +uint64_t nftnl_set_elem_get_u64(struct nftnl_set_elem *s, uint16_t attr); -bool nftnl_set_elem_attr_is_set(const struct nftnl_set_elem *s, uint16_t attr); +bool nftnl_set_elem_is_set(const struct nftnl_set_elem *s, uint16_t attr); #define nftnl_set_elem_nlmsg_build_hdr nftnl_nlmsg_build_hdr void nftnl_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s); -- cgit v1.2.3