From 428b515e2699d1061a1497db4ae8338d895aeb8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= Date: Fri, 9 Aug 2013 13:14:46 +0200 Subject: jansson: Add nft_jansson_family function Refactor some existing code with the new function nft_jansson_family. Signed-off-by: Alvaro Neira Ayuso Ayuso Signed-off-by: Pablo Neira Ayuso --- src/table.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/table.c') diff --git a/src/table.c b/src/table.c index 18d9077..1fa0dac 100644 --- a/src/table.c +++ b/src/table.c @@ -285,13 +285,8 @@ static int nft_table_json_parse(struct nft_table *t, char *json) nft_table_attr_set_str(t, NFT_TABLE_ATTR_NAME, strdup(str)); - str = nft_jansson_value_parse_str(root, "family"); - if (str == NULL) - goto err; - - family = nft_str2family(str); - if (family < 0) - goto err; + if (nft_jansson_parse_family(root, &family) != 0) + return -1; nft_table_attr_set_u32(t, NFT_TABLE_ATTR_FAMILY, family); -- cgit v1.2.3