From patchwork Fri Jun 13 09:31:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 359456 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 643BA140079 for ; Fri, 13 Jun 2014 19:32:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740AbaFMJcI (ORCPT ); Fri, 13 Jun 2014 05:32:08 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:47077 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752200AbaFMJcG (ORCPT ); Fri, 13 Jun 2014 05:32:06 -0400 Received: by mail-wi0-f175.google.com with SMTP id r20so528853wiv.2 for ; Fri, 13 Jun 2014 02:32:05 -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=fdR2gLV2xWKhs94MJRv1pEvag6zoVTw6xDvmOLtSQDI=; b=dMDuvyUSUCE4W+8JH6zhLaiJOqvL1pElElUsZb0eO3b17xfsrrSs9k3WPp7/4JU1CH CtH8EkguAhI3ONLQhny7qC+uevN+cOdtqWY4YwQ7DK1uJa2RMfvZLhbQ14ncSskCAzFf 82nuXJ1X28csw6wNGpPBqPrMJ3lK75wvwgZkbwFPjg8Rk0YexXY527JLYcLYYF8YdINv Z9OJaVMj/hqKOBvTlwyPKH3PxztEEOHzozUesUhPVOCDX5XVgc9cx0QOMAEpPmKgY/Sa v9IqXKmRCkuOyznhqy6Pcsf4SM5G7Q9hz8VMvmttLsnT4ibSgUOk8Y9k9HcO3fTMAz/H 672Q== X-Received: by 10.180.82.7 with SMTP id e7mr3097822wiy.6.1402651925661; Fri, 13 Jun 2014 02:32:05 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id o10sm5078681wjy.0.2014.06.13.02.32.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jun 2014 02:32:04 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 1/5] expr: queue: Add nft_rule_expr_queue_snprinf_* functions Date: Fri, 13 Jun 2014 11:31:49 +0200 Message-Id: <1402651913-15065-2-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1402651913-15065-1-git-send-email-anarey@gmail.com> References: <1402651913-15065-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 Code refactoring in nft_rule_expr_queue_snprinf functions. This process adds three new functions: * nft_rule_expr_queue_snprinf_default * nft_rule_expr_queue_snprinf_xml * nft_rule_expr_queue_snprinf_json Also, It is delete an unnecesary whitespace as the CodingStyle recommends. Signed-off-by: Ana Rey --- src/expr/queue.c | 82 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/src/expr/queue.c b/src/expr/queue.c index 9f269e7..5dad84a 100644 --- a/src/expr/queue.c +++ b/src/expr/queue.c @@ -194,46 +194,66 @@ nft_rule_expr_queue_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, #endif } -static int -nft_rule_expr_queue_snprintf(char *buf, size_t len, uint32_t type, - uint32_t flags, struct nft_rule_expr *e) +static int nft_rule_expr_queue_snprintf_default(char *buf, size_t len, + struct nft_rule_expr *e) { struct nft_expr_queue *queue = nft_expr_data(e); int ret; int one = 0; + ret = snprintf(buf, len, "num %u total %u", queue->queuenum, + queue->queues_total); + if (queue->flags) { + ret += snprintf(buf + ret, len - ret, " options "); + if (queue->flags & NFT_QUEUE_FLAG_BYPASS) { + ret += snprintf(buf + ret, len - ret, "bypass"); + one = 1; + } + if (queue->flags & NFT_QUEUE_FLAG_CPU_FANOUT) { + if (one) + ret += snprintf(buf + ret, len - ret, ","); + ret += snprintf(buf + ret, len - ret, "fanout"); + } + } + return ret; +} + +static int nft_rule_expr_queue_snprintf_xml(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_queue *queue = nft_expr_data(e); + + return snprintf(buf, len, "%u" + "%u" + "%u", + queue->queuenum, queue->queues_total, + queue->flags); +} + +static int nft_rule_expr_queue_snprintf_json(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_queue *queue = nft_expr_data(e); + + return snprintf(buf, len, "\"num\":%u," + "\"total\":%u," + "\"flags\":%u,", + queue->queuenum, queue->queues_total, + queue->flags); +} + +static int +nft_rule_expr_queue_snprintf(char *buf, size_t len, uint32_t type, + uint32_t flags, struct nft_rule_expr *e) +{ + switch(type) { case NFT_OUTPUT_DEFAULT: - ret = snprintf(buf, len, "num %u total %u", - queue->queuenum, queue->queues_total); - if (queue->flags) { - ret += snprintf(buf + ret , len - ret, " options "); - if (queue->flags & NFT_QUEUE_FLAG_BYPASS) { - ret += snprintf(buf + ret , - len - ret, "bypass"); - one = 1; - } - if (queue->flags & NFT_QUEUE_FLAG_CPU_FANOUT) { - if (one) - ret += snprintf(buf + ret , - len - ret, ","); - ret += snprintf(buf + ret , - len - ret, "fanout"); - } - } - return ret; + return nft_rule_expr_queue_snprintf_default(buf, len, e); case NFT_OUTPUT_XML: - return snprintf(buf, len, "%u" - "%u" - "%u", - queue->queuenum, queue->queues_total, - queue->flags); + return nft_rule_expr_queue_snprintf_xml(buf, len, e); case NFT_OUTPUT_JSON: - return snprintf(buf, len, "\"num\":%u," - "\"total\":%u," - "\"flags\":%u,", - queue->queuenum, queue->queues_total, - queue->flags); + return nft_rule_expr_queue_snprintf_json(buf, len, e); default: break; }