From 0fd53234e360d4dde8aa53dbcaad89495a4fab7f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 15 Jul 2019 08:26:43 +0200 Subject: src: add set_is_datamap(), set_is_objmap() and set_is_map() helpers Two map types are currently possible: * data maps, ie. set_is_datamap(). * object maps, ie. set_is_objmap(). This patch adds helper functions to check for the map type. set_is_map() allows you to check for either map type. Signed-off-by: Pablo Neira Ayuso --- src/json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/json.c') diff --git a/src/json.c b/src/json.c index 1006d7bb..f40dc518 100644 --- a/src/json.c +++ b/src/json.c @@ -79,10 +79,10 @@ static json_t *set_print_json(struct output_ctx *octx, const struct set *set) json_t *root, *tmp; const char *type, *datatype_ext = NULL; - if (set->flags & NFT_SET_MAP) { + if (set_is_datamap(set->flags)) { type = "map"; datatype_ext = set->datatype->name; - } else if (set->flags & NFT_SET_OBJECT) { + } else if (set_is_objmap(set->flags)) { type = "map"; datatype_ext = obj_type_name(set->objtype); } else if (set->flags & NFT_SET_EVAL) { -- cgit v1.2.3