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/rule.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/libnftnl/rule.h') diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h index 3cc79bd..d5b50ad 100644 --- a/include/libnftnl/rule.h +++ b/include/libnftnl/rule.h @@ -31,22 +31,22 @@ enum nftnl_rule_attr { }; #define NFTNL_RULE_MAX (__NFTNL_RULE_MAX - 1) -void nftnl_rule_attr_unset(struct nftnl_rule *r, uint16_t attr); -bool nftnl_rule_attr_is_set(const struct nftnl_rule *r, uint16_t attr); -void nftnl_rule_attr_set(struct nftnl_rule *r, uint16_t attr, const void *data); -void nftnl_rule_attr_set_data(struct nftnl_rule *r, uint16_t attr, +void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr); +bool nftnl_rule_is_set(const struct nftnl_rule *r, uint16_t attr); +void nftnl_rule_set(struct nftnl_rule *r, uint16_t attr, const void *data); +void nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, const void *data, uint32_t data_len); -void nftnl_rule_attr_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val); -void nftnl_rule_attr_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val); -void nftnl_rule_attr_set_str(struct nftnl_rule *r, uint16_t attr, const char *str); +void nftnl_rule_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val); +void nftnl_rule_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val); +void nftnl_rule_set_str(struct nftnl_rule *r, uint16_t attr, const char *str); -const void *nftnl_rule_attr_get(const struct nftnl_rule *r, uint16_t attr); -const void *nftnl_rule_attr_get_data(const struct nftnl_rule *r, uint16_t attr, +const void *nftnl_rule_get(const struct nftnl_rule *r, uint16_t attr); +const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, uint32_t *data_len); -const char *nftnl_rule_attr_get_str(const struct nftnl_rule *r, uint16_t attr); -uint8_t nftnl_rule_attr_get_u8(const struct nftnl_rule *r, uint16_t attr); -uint32_t nftnl_rule_attr_get_u32(const struct nftnl_rule *r, uint16_t attr); -uint64_t nftnl_rule_attr_get_u64(const struct nftnl_rule *r, uint16_t attr); +const char *nftnl_rule_get_str(const struct nftnl_rule *r, uint16_t attr); +uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr); +uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr); +uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr); void nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_expr *expr); -- cgit v1.2.3