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 --- src/jansson.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/jansson.c') diff --git a/src/jansson.c b/src/jansson.c index 5c89ec7..38a6b97 100644 --- a/src/jansson.c +++ b/src/jansson.c @@ -251,22 +251,22 @@ int nftnl_jansson_set_elem_parse(struct nftnl_set_elem *e, json_t *root, uint32_t flags; if (nftnl_jansson_parse_val(root, "flags", NFTNL_TYPE_U32, &flags, err) == 0) - nftnl_set_elem_attr_set_u32(e, NFTNL_SET_ELEM_ATTR_FLAGS, flags); + nftnl_set_elem_attr_set_u32(e, NFTNL_SET_ELEM_FLAGS, flags); if (nftnl_jansson_data_reg_parse(root, "key", &e->key, err) == DATA_VALUE) - e->flags |= (1 << NFTNL_SET_ELEM_ATTR_KEY); + e->flags |= (1 << NFTNL_SET_ELEM_KEY); if (nftnl_jansson_node_exist(root, "data")) { set_elem_data = nftnl_jansson_data_reg_parse(root, "data", &e->data, err); switch (set_elem_data) { case DATA_VALUE: - e->flags |= (1 << NFTNL_SET_ELEM_ATTR_DATA); + e->flags |= (1 << NFTNL_SET_ELEM_DATA); break; case DATA_VERDICT: - e->flags |= (1 << NFTNL_SET_ELEM_ATTR_VERDICT); + e->flags |= (1 << NFTNL_SET_ELEM_VERDICT); if (e->data.chain != NULL) - e->flags |= (1 << NFTNL_SET_ELEM_ATTR_CHAIN); + e->flags |= (1 << NFTNL_SET_ELEM_CHAIN); break; case DATA_NONE: default: -- cgit v1.2.3