From patchwork Wed Oct 14 22:17:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Morris X-Patchwork-Id: 530409 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 E6E0B140E41 for ; Thu, 15 Oct 2015 09:17:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=ipmorris.net header.i=@ipmorris.net header.b=tqTmarGY; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932454AbbJNWRm (ORCPT ); Wed, 14 Oct 2015 18:17:42 -0400 Received: from inet-gw.chirality.org.uk ([88.97.209.22]:46079 "EHLO cedar.ipmorris.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754201AbbJNWRR (ORCPT ); Wed, 14 Oct 2015 18:17:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ipmorris.net; s=cedar; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=OBeoDXIMRpachfhirLMKlgpWBKNtVHWrmMFqxdmICPo=; b=tqTmarGYkcWDkxDFwA/LrrRXQP7HnU8Shaf6LixEmpZUFx3krslTuaemTxiYU9cLQm5MfmzO4mb8dM64swcqyJ+0cFEhW52cq+RjP7cNLX140ZRIR1cPBpCfvxA8D9v0fa7G5b9ff38hHzjNfXkK6ozZPbElFwlk9muIFGVDZSMOBN3caM+xOznLJk8wXf2VaUtcFYHuUaAJz6CFPeFtICeuZUHC7o5LNNXIw6YemcvAGcgcVrtndtovR1Pyb9iNw6nkFzDdG1kWuRSYwDalRAkAAHANXbqyEThfd4VePGLtm7WgclREGj9QLiKovR16OW+VDmPWIcuM0JXKrAHlVQ==; Received: from localhost ([127.0.0.1] helo=portable-home.client.ipmorris.net) by cedar.ipmorris.net with esmtp (Exim 4.82) (envelope-from ) id 1ZmUMF-0001Fe-0G; Wed, 14 Oct 2015 23:17:15 +0100 From: Ian Morris To: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Cc: Ian Morris Subject: [PATCH nf-next 6/6] netfilter-ipv4: whitespace around operators Date: Wed, 14 Oct 2015 23:17:08 +0100 Message-Id: <1444861028-21556-7-git-send-email-ipm@chirality.org.uk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444861028-21556-1-git-send-email-ipm@chirality.org.uk> References: <1444861028-21556-1-git-send-email-ipm@chirality.org.uk> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch cleanses whitespace around arithmetical operators. No changes detected by objdiff. Signed-off-by: Ian Morris --- net/ipv4/netfilter/ipt_CLUSTERIP.c | 8 ++++---- net/ipv4/netfilter/ipt_ah.c | 2 +- net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index 3f32c03..4a9e6db 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -492,14 +492,14 @@ static void arp_print(struct arp_payload *payload) { #define HBUFFERLEN 30 char hbuffer[HBUFFERLEN]; - int j,k; + int j, k; - for (k=0, j=0; k < HBUFFERLEN-3 && j < ETH_ALEN; j++) { + for (k = 0, j = 0; k < HBUFFERLEN - 3 && j < ETH_ALEN; j++) { hbuffer[k++] = hex_asc_hi(payload->src_hw[j]); hbuffer[k++] = hex_asc_lo(payload->src_hw[j]); - hbuffer[k++]=':'; + hbuffer[k++] = ':'; } - hbuffer[--k]='\0'; + hbuffer[--k] = '\0'; pr_debug("src %pI4@%s, dst %pI4\n", &payload->src_ip, hbuffer, &payload->dst_ip); diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c index 14a2aa8..a787d07 100644 --- a/net/ipv4/netfilter/ipt_ah.c +++ b/net/ipv4/netfilter/ipt_ah.c @@ -25,7 +25,7 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert) bool r; pr_debug("spi_match:%c 0x%x <= 0x%x <= 0x%x\n", invert ? '!' : ' ', min, spi, max); - r=(spi >= min && spi <= max) ^ invert; + r = (spi >= min && spi <= max) ^ invert; pr_debug(" result %s\n", r ? "PASS" : "FAILED"); return r; } diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c index 8e3dffa..89be5c5 100644 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c @@ -1156,7 +1156,7 @@ static int snmp_parse_mangle(unsigned char *msg, } if (obj->type == SNMP_IPADDR) - mangle_address(ctx.begin, ctx.pointer - 4 , map, check); + mangle_address(ctx.begin, ctx.pointer - 4, map, check); kfree(obj->id); kfree(obj);