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/set.h | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'include/libnftnl/set.h') 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; -- cgit v1.2.3