From patchwork Wed Aug 17 13:29:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 660109 X-Patchwork-Delegate: pablo@netfilter.org 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 3sDqq24wq9z9t1m for ; Wed, 17 Aug 2016 23:30:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752629AbcHQNaV (ORCPT ); Wed, 17 Aug 2016 09:30:21 -0400 Received: from mail.us.es ([193.147.175.20]:44048 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbcHQNaP (ORCPT ); Wed, 17 Aug 2016 09:30:15 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 16E94E9773 for ; Wed, 17 Aug 2016 15:30:14 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 03554DA7FD for ; Wed, 17 Aug 2016 15:30:14 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id EC6D4FC61A; Wed, 17 Aug 2016 15:30:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-103.2 required=7.5 tests=BAYES_50,SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id D1D21DA7E5 for ; Wed, 17 Aug 2016 15:30:11 +0200 (CEST) Received: from 192.168.1.13 (192.168.1.13) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/530/antivirus1-rhel7.int); Wed, 17 Aug 2016 15:30:11 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/530/antivirus1-rhel7.int) Received: (qmail 25902 invoked from network); 17 Aug 2016 15:30:11 +0200 Received: from 77.166.216.87.static.jazztel.es (HELO salvia.here) (pneira@us.es@87.216.166.77) by mail.us.es with SMTP; 17 Aug 2016 15:30:11 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de Subject: [PATCH nft 08/10] src: simplify classid printing using %x instead of %04x Date: Wed, 17 Aug 2016 15:29:59 +0200 Message-Id: <1471440601-5327-9-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471440601-5327-1-git-send-email-pablo@netfilter.org> References: <1471440601-5327-1-git-send-email-pablo@netfilter.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org No need to print this in iptables CLASSIFY target format, eg. 0004:1230, this is innecessarily large. And always print major and minor numbers. Signed-off-by: Pablo Neira Ayuso --- src/meta.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/meta.c b/src/meta.c index c7967b0..1b17819 100644 --- a/src/meta.c +++ b/src/meta.c @@ -80,14 +80,7 @@ static void tchandle_type_print(const struct expr *expr) printf("none"); break; default: - if (TC_H_MAJ(handle) == 0) - printf(":%04x", TC_H_MIN(handle)); - else if (TC_H_MIN(handle) == 0) - printf("%04x:", TC_H_MAJ(handle) >> 16); - else { - printf("%04x:%04x", - TC_H_MAJ(handle) >> 16, TC_H_MIN(handle)); - } + printf("%0x:%0x", TC_H_MAJ(handle) >> 16, TC_H_MIN(handle)); break; } }