From 0e7b6c4983af4ddd3a50c3ce756638af157c7130 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 7 Sep 2015 18:02:50 +0200 Subject: src: get rid of _ATTR_ infix in new nfntl_ definitions The constant names are already large, trim off the _ATTR_ infix in the attribute definitions. Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/chain.h | 30 ++++++++++++++-------------- include/libnftnl/rule.h | 22 ++++++++++---------- include/libnftnl/ruleset.h | 8 ++++---- include/libnftnl/set.h | 50 +++++++++++++++++++++++----------------------- include/libnftnl/table.h | 14 ++++++------- 5 files changed, 62 insertions(+), 62 deletions(-) (limited to 'include') diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h index d952ce9..9fd637d 100644 --- a/include/libnftnl/chain.h +++ b/include/libnftnl/chain.h @@ -17,22 +17,22 @@ struct nftnl_chain; struct nftnl_chain *nftnl_chain_alloc(void); void nftnl_chain_free(struct nftnl_chain *); -enum { - NFTNL_CHAIN_ATTR_NAME = 0, - NFTNL_CHAIN_ATTR_FAMILY, - NFTNL_CHAIN_ATTR_TABLE, - NFTNL_CHAIN_ATTR_HOOKNUM, - NFTNL_CHAIN_ATTR_PRIO = 4, - NFTNL_CHAIN_ATTR_POLICY, - NFTNL_CHAIN_ATTR_USE, - NFTNL_CHAIN_ATTR_BYTES, - NFTNL_CHAIN_ATTR_PACKETS = 8, - NFTNL_CHAIN_ATTR_HANDLE, - NFTNL_CHAIN_ATTR_TYPE, - NFTNL_CHAIN_ATTR_DEV, - __NFTNL_CHAIN_ATTR_MAX +enum nftnl_chain_attr { + NFTNL_CHAIN_NAME = 0, + NFTNL_CHAIN_FAMILY, + NFTNL_CHAIN_TABLE, + NFTNL_CHAIN_HOOKNUM, + NFTNL_CHAIN_PRIO = 4, + NFTNL_CHAIN_POLICY, + NFTNL_CHAIN_USE, + NFTNL_CHAIN_BYTES, + NFTNL_CHAIN_PACKETS = 8, + NFTNL_CHAIN_HANDLE, + NFTNL_CHAIN_TYPE, + NFTNL_CHAIN_DEV, + __NFTNL_CHAIN_MAX }; -#define NFTNL_CHAIN_ATTR_MAX (__NFTNL_CHAIN_ATTR_MAX - 1) +#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); diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h index f5f8555..3cc79bd 100644 --- a/include/libnftnl/rule.h +++ b/include/libnftnl/rule.h @@ -18,18 +18,18 @@ struct nftnl_expr; struct nftnl_rule *nftnl_rule_alloc(void); void nftnl_rule_free(struct nftnl_rule *); -enum { - NFTNL_RULE_ATTR_FAMILY = 0, - NFTNL_RULE_ATTR_TABLE, - NFTNL_RULE_ATTR_CHAIN, - NFTNL_RULE_ATTR_HANDLE, - NFTNL_RULE_ATTR_COMPAT_PROTO, - NFTNL_RULE_ATTR_COMPAT_FLAGS, - NFTNL_RULE_ATTR_POSITION, - NFTNL_RULE_ATTR_USERDATA, - __NFTNL_RULE_ATTR_MAX +enum nftnl_rule_attr { + NFTNL_RULE_FAMILY = 0, + NFTNL_RULE_TABLE, + NFTNL_RULE_CHAIN, + NFTNL_RULE_HANDLE, + NFTNL_RULE_COMPAT_PROTO, + NFTNL_RULE_COMPAT_FLAGS, + NFTNL_RULE_POSITION, + NFTNL_RULE_USERDATA, + __NFTNL_RULE_MAX }; -#define NFTNL_RULE_ATTR_MAX (__NFTNL_RULE_ATTR_MAX - 1) +#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); diff --git a/include/libnftnl/ruleset.h b/include/libnftnl/ruleset.h index 6c304dc..a627e1d 100644 --- a/include/libnftnl/ruleset.h +++ b/include/libnftnl/ruleset.h @@ -19,10 +19,10 @@ struct nftnl_ruleset *nftnl_ruleset_alloc(void); void nftnl_ruleset_free(struct nftnl_ruleset *r); enum { - NFTNL_RULESET_ATTR_TABLELIST = 0, - NFTNL_RULESET_ATTR_CHAINLIST, - NFTNL_RULESET_ATTR_SETLIST, - NFTNL_RULESET_ATTR_RULELIST, + NFTNL_RULESET_TABLELIST = 0, + NFTNL_RULESET_CHAINLIST, + NFTNL_RULESET_SETLIST, + NFTNL_RULESET_RULELIST, }; enum nftnl_ruleset_type { diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h index 4420d03..bee8dfa 100644 --- a/include/libnftnl/set.h +++ b/include/libnftnl/set.h @@ -8,23 +8,23 @@ #include -enum { - NFTNL_SET_ATTR_TABLE, - NFTNL_SET_ATTR_NAME, - NFTNL_SET_ATTR_FLAGS, - NFTNL_SET_ATTR_KEY_TYPE, - NFTNL_SET_ATTR_KEY_LEN, - NFTNL_SET_ATTR_DATA_TYPE, - NFTNL_SET_ATTR_DATA_LEN, - NFTNL_SET_ATTR_FAMILY, - NFTNL_SET_ATTR_ID, - NFTNL_SET_ATTR_POLICY, - NFTNL_SET_ATTR_DESC_SIZE, - NFTNL_SET_ATTR_TIMEOUT, - NFTNL_SET_ATTR_GC_INTERVAL, - __NFTNL_SET_ATTR_MAX +enum nftnl_set_attr { + NFTNL_SET_TABLE, + NFTNL_SET_NAME, + NFTNL_SET_FLAGS, + NFTNL_SET_KEY_TYPE, + NFTNL_SET_KEY_LEN, + NFTNL_SET_DATA_TYPE, + NFTNL_SET_DATA_LEN, + NFTNL_SET_FAMILY, + NFTNL_SET_ID, + NFTNL_SET_POLICY, + NFTNL_SET_DESC_SIZE, + NFTNL_SET_TIMEOUT, + NFTNL_SET_GC_INTERVAL, + __NFTNL_SET_MAX }; -#define NFTNL_SET_ATTR_MAX (__NFTNL_SET_ATTR_MAX - 1) +#define NFTNL_SET_MAX (__NFTNL_SET_MAX - 1) struct nftnl_set; @@ -85,15 +85,15 @@ int nftnl_set_parse_file(struct nftnl_set *s, enum nftnl_parse_type type, */ enum { - NFTNL_SET_ELEM_ATTR_FLAGS, - NFTNL_SET_ELEM_ATTR_KEY, - NFTNL_SET_ELEM_ATTR_VERDICT, - NFTNL_SET_ELEM_ATTR_CHAIN, - NFTNL_SET_ELEM_ATTR_DATA, - NFTNL_SET_ELEM_ATTR_TIMEOUT, - NFTNL_SET_ELEM_ATTR_EXPIRATION, - NFTNL_SET_ELEM_ATTR_USERDATA, - NFTNL_SET_ELEM_ATTR_EXPR, + NFTNL_SET_ELEM_FLAGS, + NFTNL_SET_ELEM_KEY, + NFTNL_SET_ELEM_VERDICT, + NFTNL_SET_ELEM_CHAIN, + NFTNL_SET_ELEM_DATA, + NFTNL_SET_ELEM_TIMEOUT, + NFTNL_SET_ELEM_EXPIRATION, + NFTNL_SET_ELEM_USERDATA, + NFTNL_SET_ELEM_EXPR, }; struct nftnl_set_elem; diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h index ca9a5c6..d18d348 100644 --- a/include/libnftnl/table.h +++ b/include/libnftnl/table.h @@ -17,14 +17,14 @@ struct nftnl_table; struct nftnl_table *nftnl_table_alloc(void); void nftnl_table_free(struct nftnl_table *); -enum { - NFTNL_TABLE_ATTR_NAME = 0, - NFTNL_TABLE_ATTR_FAMILY, - NFTNL_TABLE_ATTR_FLAGS, - NFTNL_TABLE_ATTR_USE, - __NFTNL_TABLE_ATTR_MAX +enum nftnl_table_attr { + NFTNL_TABLE_NAME = 0, + NFTNL_TABLE_FAMILY, + NFTNL_TABLE_FLAGS, + NFTNL_TABLE_USE, + __NFTNL_TABLE_MAX }; -#define NFTNL_TABLE_ATTR_MAX (__NFTNL_TABLE_ATTR_MAX - 1) +#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); -- cgit v1.2.3