6 files changed, 76 insertions, 76 deletions

diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h
index 9fd637d..9ac8830 100644
--- a/include/libnftnl/chain.h
+++ b/include/libnftnl/chain.h
@@ -34,25 +34,25 @@ enum nftnl_chain_attr {
 };
 #define NFTNL_CHAIN_MAX (__NFTNL_CHAIN_MAX - 1)
 
-bool nftnl_chain_attr_is_set(const struct nftnl_chain *c, uint16_t attr);
-void nftnl_chain_attr_unset(struct nftnl_chain *c, uint16_t attr);
-void nftnl_chain_attr_set(struct nftnl_chain *t, uint16_t attr, const void *data);
-void nftnl_chain_attr_set_data(struct nftnl_chain *t, uint16_t attr,
+bool nftnl_chain_is_set(const struct nftnl_chain *c, uint16_t attr);
+void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr);
+void nftnl_chain_set(struct nftnl_chain *t, uint16_t attr, const void *data);
+void nftnl_chain_set_data(struct nftnl_chain *t, uint16_t attr,
 			     const void *data, uint32_t data_len);
-void nftnl_chain_attr_set_u8(struct nftnl_chain *t, uint16_t attr, uint8_t data);
-void nftnl_chain_attr_set_u32(struct nftnl_chain *t, uint16_t attr, uint32_t data);
-void nftnl_chain_attr_set_s32(struct nftnl_chain *t, uint16_t attr, int32_t data);
-void nftnl_chain_attr_set_u64(struct nftnl_chain *t, uint16_t attr, uint64_t data);
-void nftnl_chain_attr_set_str(struct nftnl_chain *t, uint16_t attr, const char *str);
-
-const void *nftnl_chain_attr_get(struct nftnl_chain *c, uint16_t attr);
-const void *nftnl_chain_attr_get_data(struct nftnl_chain *c, uint16_t attr,
+void nftnl_chain_set_u8(struct nftnl_chain *t, uint16_t attr, uint8_t data);
+void nftnl_chain_set_u32(struct nftnl_chain *t, uint16_t attr, uint32_t data);
+void nftnl_chain_set_s32(struct nftnl_chain *t, uint16_t attr, int32_t data);
+void nftnl_chain_set_u64(struct nftnl_chain *t, uint16_t attr, uint64_t data);
+void nftnl_chain_set_str(struct nftnl_chain *t, uint16_t attr, const char *str);
+
+const void *nftnl_chain_get(struct nftnl_chain *c, uint16_t attr);
+const void *nftnl_chain_get_data(struct nftnl_chain *c, uint16_t attr,
 				    uint32_t *data_len);
-const char *nftnl_chain_attr_get_str(struct nftnl_chain *c, uint16_t attr);
-uint8_t nftnl_chain_attr_get_u8(struct nftnl_chain *c, uint16_t attr);
-uint32_t nftnl_chain_attr_get_u32(struct nftnl_chain *c, uint16_t attr);
-int32_t nftnl_chain_attr_get_s32(struct nftnl_chain *c, uint16_t attr);
-uint64_t nftnl_chain_attr_get_u64(struct nftnl_chain *c, uint16_t attr);
+const char *nftnl_chain_get_str(struct nftnl_chain *c, uint16_t attr);
+uint8_t nftnl_chain_get_u8(struct nftnl_chain *c, uint16_t attr);
+uint32_t nftnl_chain_get_u32(struct nftnl_chain *c, uint16_t attr);
+int32_t nftnl_chain_get_s32(struct nftnl_chain *c, uint16_t attr);
+uint64_t nftnl_chain_get_u64(struct nftnl_chain *c, uint16_t attr);
 
 struct nlmsghdr;
 
diff --git a/include/libnftnl/gen.h b/include/libnftnl/gen.h
index 1bb2d56..3eb8470 100644
--- a/include/libnftnl/gen.h
+++ b/include/libnftnl/gen.h
@@ -23,17 +23,17 @@ enum {
 };
 #define NFTNL_GEN_MAX (__NFTNL_GEN_MAX - 1)
 
-bool nftnl_gen_attr_is_set(const struct nftnl_gen *gen, uint16_t attr);
-void nftnl_gen_attr_unset(struct nftnl_gen *gen, uint16_t attr);
-void nftnl_gen_attr_set(struct nftnl_gen *gen, uint16_t attr, const void *data);
-void nftnl_gen_attr_set_data(struct nftnl_gen *gen, uint16_t attr,
+bool nftnl_gen_is_set(const struct nftnl_gen *gen, uint16_t attr);
+void nftnl_gen_unset(struct nftnl_gen *gen, uint16_t attr);
+void nftnl_gen_set(struct nftnl_gen *gen, uint16_t attr, const void *data);
+void nftnl_gen_set_data(struct nftnl_gen *gen, uint16_t attr,
 			     const void *data, uint32_t data_len);
-const void *nftnl_gen_attr_get(struct nftnl_gen *gen, uint16_t attr);
-const void *nftnl_gen_attr_get_data(struct nftnl_gen *gen, uint16_t attr,
+const void *nftnl_gen_get(struct nftnl_gen *gen, uint16_t attr);
+const void *nftnl_gen_get_data(struct nftnl_gen *gen, uint16_t attr,
 				    uint32_t *data_len);
 
-void nftnl_gen_attr_set_u32(struct nftnl_gen *gen, uint16_t attr, uint32_t data);
-uint32_t nftnl_gen_attr_get_u32(struct nftnl_gen *gen, uint16_t attr);
+void nftnl_gen_set_u32(struct nftnl_gen *gen, uint16_t attr, uint32_t data);
+uint32_t nftnl_gen_get_u32(struct nftnl_gen *gen, uint16_t attr);
 
 struct nlmsghdr;
 int nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen);
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);
 
diff --git a/include/libnftnl/ruleset.h b/include/libnftnl/ruleset.h
index a627e1d..c184af6 100644
--- a/include/libnftnl/ruleset.h
+++ b/include/libnftnl/ruleset.h
@@ -35,10 +35,10 @@ enum nftnl_ruleset_type {
 	NFTNL_RULESET_SET_ELEMS,
 };
 
-bool nftnl_ruleset_attr_is_set(const struct nftnl_ruleset *r, uint16_t attr);
-void nftnl_ruleset_attr_unset(struct nftnl_ruleset *r, uint16_t attr);
-void nftnl_ruleset_attr_set(struct nftnl_ruleset *r, uint16_t attr, void *data);
-void *nftnl_ruleset_attr_get(const struct nftnl_ruleset *r, uint16_t attr);
+bool nftnl_ruleset_is_set(const struct nftnl_ruleset *r, uint16_t attr);
+void nftnl_ruleset_unset(struct nftnl_ruleset *r, uint16_t attr);
+void nftnl_ruleset_set(struct nftnl_ruleset *r, uint16_t attr, void *data);
+void *nftnl_ruleset_get(const struct nftnl_ruleset *r, uint16_t attr);
 
 enum {
 	NFTNL_RULESET_CTX_CMD = 0,
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);
diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h
index d18d348..c52d579 100644
--- a/include/libnftnl/table.h
+++ b/include/libnftnl/table.h
@@ -26,21 +26,21 @@ enum nftnl_table_attr {
 };
 #define NFTNL_TABLE_MAX (__NFTNL_TABLE_MAX - 1)
 
-bool nftnl_table_attr_is_set(const struct nftnl_table *t, uint16_t attr);
-void nftnl_table_attr_unset(struct nftnl_table *t, uint16_t attr);
-void nftnl_table_attr_set(struct nftnl_table *t, uint16_t attr, const void *data);
-void nftnl_table_attr_set_data(struct nftnl_table *t, uint16_t attr,
+bool nftnl_table_is_set(const struct nftnl_table *t, uint16_t attr);
+void nftnl_table_unset(struct nftnl_table *t, uint16_t attr);
+void nftnl_table_set(struct nftnl_table *t, uint16_t attr, const void *data);
+void nftnl_table_set_data(struct nftnl_table *t, uint16_t attr,
 			     const void *data, uint32_t data_len);
-const void *nftnl_table_attr_get(struct nftnl_table *t, uint16_t attr);
-const void *nftnl_table_attr_get_data(struct nftnl_table *t, uint16_t attr,
+const void *nftnl_table_get(struct nftnl_table *t, uint16_t attr);
+const void *nftnl_table_get_data(struct nftnl_table *t, uint16_t attr,
 				    uint32_t *data_len);
 
-void nftnl_table_attr_set_u8(struct nftnl_table *t, uint16_t attr, uint8_t data);
-void nftnl_table_attr_set_u32(struct nftnl_table *t, uint16_t attr, uint32_t data);
-void nftnl_table_attr_set_str(struct nftnl_table *t, uint16_t attr, const char *str);
-uint8_t nftnl_table_attr_get_u8(struct nftnl_table *t, uint16_t attr);
-uint32_t nftnl_table_attr_get_u32(struct nftnl_table *t, uint16_t attr);
-const char *nftnl_table_attr_get_str(struct nftnl_table *t, uint16_t attr);
+void nftnl_table_set_u8(struct nftnl_table *t, uint16_t attr, uint8_t data);
+void nftnl_table_set_u32(struct nftnl_table *t, uint16_t attr, uint32_t data);
+void nftnl_table_set_str(struct nftnl_table *t, uint16_t attr, const char *str);
+uint8_t nftnl_table_get_u8(struct nftnl_table *t, uint16_t attr);
+uint32_t nftnl_table_get_u32(struct nftnl_table *t, uint16_t attr);
+const char *nftnl_table_get_str(struct nftnl_table *t, uint16_t attr);
 
 struct nlmsghdr;