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/chain.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/chain.c') diff --git a/src/chain.c b/src/chain.c index e2e6f90..a6d99ca 100644 --- a/src/chain.c +++ b/src/chain.c @@ -517,14 +517,8 @@ static int nft_chain_json_parse(struct nft_chain *c, char *json) nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_PACKETS, uval64); - valstr = nft_jansson_value_parse_str(root, "family"); - - if (valstr == NULL) - goto err; - - val32 = nft_str2family(valstr); - if (val32 == -1) - goto err; + if (nft_jansson_parse_family(root, &val32) != 0) + return -1; nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_FAMILY, val32); -- cgit v1.2.3