From patchwork Thu Jun 26 16:38:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 364608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C6ED114007C for ; Fri, 27 Jun 2014 02:39:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932411AbaFZQj3 (ORCPT ); Thu, 26 Jun 2014 12:39:29 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:48042 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932387AbaFZQj0 (ORCPT ); Thu, 26 Jun 2014 12:39:26 -0400 Received: by mail-wg0-f52.google.com with SMTP id b13so3938508wgh.23 for ; Thu, 26 Jun 2014 09:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GLF9mKTkXpSACSKftL0kNAbaEa4ZEM0I47gpckH7J/g=; b=hGVMLVzLfb+AWr87PxhF43q98E5jCK4S3mC+lrrqGnk4NBWI32h5N6fhZ0tVQcWwoV /FD8g6sSKX7WBvVok03ZWWTTMMJj5VaDIv73feJtRmowsXIarbWu4zWPk2IgC5VVkxUh AvM7Ns21kGBIqgzMwFRGZfxyLUM9oE0W8rFXwZoWxWnnjjwynzC/mQSVx4LxA1eBEyd2 dDYzoId5dmLlREm5tbLQ9KT2BNE9t4vFKZhvA8F7EEwozDHFx3ZNQq3eRbXTzc7KlnmO ckmKF8sMkxWmmX2sep9WeIlt65hTZzBYMbkqZVZtdXRpc8AubOk6Gyf7AX57DnxK10wJ cb3A== X-Received: by 10.194.59.65 with SMTP id x1mr18978803wjq.60.1403800763268; Thu, 26 Jun 2014 09:39:23 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id fq2sm26251899wib.2.2014.06.26.09.39.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jun 2014 09:39:22 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 5/6] src: chain: Rename variables in nft_jansson_parse_chain functions Date: Thu, 26 Jun 2014 18:38:59 +0200 Message-Id: <1403800740-10572-6-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403800740-10572-1-git-send-email-anarey@gmail.com> References: <1403800740-10572-1-git-send-email-anarey@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Renames some variables for code readability reasons. Signed-off-by: Ana Rey --- src/chain.c | 64 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/chain.c b/src/chain.c index 2a39985..042ff13 100644 --- a/src/chain.c +++ b/src/chain.c @@ -565,90 +565,90 @@ int nft_jansson_parse_chain(struct nft_chain *c, json_t *tree, struct nft_parse_err *err) { json_t *root; - uint64_t uval64; - int policy; - int32_t val32, use; - const char *valstr; + uint64_t handle, bytes, packets; + int policy_num; + int32_t family, prio, hooknum, use; + const char *name, *table, *type, *hooknum_str, *policy; root = nft_jansson_get_node(tree, "chain", err); if (root == NULL) return -1; - valstr = nft_jansson_parse_str(root, "name", err); - if (valstr == NULL) + name = nft_jansson_parse_str(root, "name", err); + if (name == NULL) return -1; - nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_NAME, valstr); + nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_NAME, name); - if (nft_jansson_parse_val(root, "handle", NFT_TYPE_U64, &uval64, + if (nft_jansson_parse_val(root, "handle", NFT_TYPE_U64, &handle, err) < 0) return -1; - nft_chain_attr_set_u64(c,NFT_CHAIN_ATTR_HANDLE, uval64); + nft_chain_attr_set_u64(c,NFT_CHAIN_ATTR_HANDLE, handle); - if (nft_jansson_parse_val(root, "bytes", NFT_TYPE_U64, &uval64, + if (nft_jansson_parse_val(root, "bytes", NFT_TYPE_U64, &bytes, err) < 0) return -1; - nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_BYTES, uval64); + nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_BYTES, bytes); - if (nft_jansson_parse_val(root, "packets", NFT_TYPE_U64, &uval64, + if (nft_jansson_parse_val(root, "packets", NFT_TYPE_U64, &packets, err) < 0) return -1; - nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_PACKETS, uval64); + nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_PACKETS, packets); - if (nft_jansson_parse_family(root, &val32, err) != 0) + if (nft_jansson_parse_family(root, &family, err) != 0) return -1; - nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_FAMILY, val32); + nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_FAMILY, family); - valstr = nft_jansson_parse_str(root, "table", err); + table = nft_jansson_parse_str(root, "table", err); - if (valstr == NULL) + if (table == NULL) return -1; - nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TABLE, valstr); + nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TABLE, table); if (nft_jansson_parse_val(root, "use", NFT_TYPE_U32, &use, err) == 0) nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_USE, use); if (nft_jansson_node_exist(root, "hooknum")) { - valstr = nft_jansson_parse_str(root, "type", err); + type = nft_jansson_parse_str(root, "type", err); - if (valstr == NULL) + if (type == NULL) return -1; - nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TYPE, valstr); + nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TYPE, type); if (nft_jansson_parse_val(root, "prio", NFT_TYPE_S32, - &val32, err) < 0) + &prio, err) < 0) return -1; - nft_chain_attr_set_s32(c, NFT_CHAIN_ATTR_PRIO, val32); + nft_chain_attr_set_s32(c, NFT_CHAIN_ATTR_PRIO, prio); - valstr = nft_jansson_parse_str(root, "hooknum", err); - if (valstr == NULL) + hooknum_str = nft_jansson_parse_str(root, "hooknum", err); + if (hooknum_str == NULL) return -1; - val32 = nft_str2hooknum(c->family, valstr); - if (val32 == -1) + hooknum = nft_str2hooknum(c->family, hooknum_str); + if (hooknum == -1) return -1; - nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_HOOKNUM, val32); + nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_HOOKNUM, hooknum); - valstr = nft_jansson_parse_str(root, "policy", err); - if (valstr == NULL) + policy = nft_jansson_parse_str(root, "policy", err); + if (policy == NULL) return -1; - if (nft_str2verdict(valstr, &policy) != 0) { + if (nft_str2verdict(policy, &policy_num) != 0) { errno = EINVAL; err->node_name = "policy"; err->error = NFT_PARSE_EBADTYPE; return -1; } - nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_POLICY, policy); + nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_POLICY, policy_num); } return 0;