From nobody Mon Feb 07 13:56:02 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CCF4019B0FB2; Mon, 7 Feb 2022 13:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jsnjc0BB3z51sp; Mon, 7 Feb 2022 13:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644242164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNj81/2ZeUR9zFov8iUiFbApe9VfuIoGd9CXl9Ywh/Q=; b=QMm6VjGMdPWF6h1zG+jHEyHdqq4IxM6W+g5QtRTUzXKkVtfSR/w/81MpJeh1L/7HW8Snee nDCXfgrVl8XhEIV1Fr0B6fbOSA/f/eEiUVPhZ2qOZpAF/a5KXrynnAQEezag5WdTXwn9PA 9YfFnUh4DqwsXPtoz1/yIKdatXNUtY8fU3mhZ5UQ8tVuSixtU1lL9QRoarxPo7EtwuWp51 o2JafBrOyNsez3T0LLWNnXoc1ipwfapu78cxQgQO4gYVr1qm2BlymCh+IiN5naqChHbPKG GVfQAhcINhwYq3mZnL5KDsB0NMYJPvuaXIbcuPtlTRxdHaptAiTqxp9M3xBXeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3BF02694D; Mon, 7 Feb 2022 13:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217Du25l085371; Mon, 7 Feb 2022 13:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217Du2F9085370; Mon, 7 Feb 2022 13:56:02 GMT (envelope-from git) Date: Mon, 7 Feb 2022 13:56:02 GMT Message-Id: <202202071356.217Du2F9085370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: aa5d673c5294 - stable/12 - ipfilter userland: Fix whitespace errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: aa5d673c529491a01ede1c91aad67b2762f8f4bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644242164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNj81/2ZeUR9zFov8iUiFbApe9VfuIoGd9CXl9Ywh/Q=; b=OHXpS4nWfqNOzJ/HwsHIUfGlAIa+w7fHAMCtBow7xQOnLdcq0KikiPQWtRupf+mNH+4rqc GWZah0vtS0hciHNIdMSAtaAun/KnZi9RR2iZWv7FUa4ErpdyFwAUs5m79/d5Wd+8uZ3TMm VufCjIUA7VJ+k3M5XzU597oZx3ZGuWbKWlf7lFDi5YBFARSE/Fv3A3kyH7lPQ/2S+68wR2 /qMIEVDsVpeHClzNb40T08mlTbo1hva/zMEudiTq4LtqTTP2qxbSMN9uE76iDbCRQiuY+y 0YyrZfyHiumYkNLhTzAAabjWd8d3eTeVoA53bhxAFRjMJgEzkF27CGQhk46CYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644242164; a=rsa-sha256; cv=none; b=pYMYyIdekoNJp295yfLteq9aMKegdZRdXlc1SQ/O+Ulx+sglHsEkMoGwmwY54aTTgzatY5 9a3IX6xP0+yTKM5pbj7REVE4Ile8Z/YTQaL3w1rLM3+8Nq3qTtp0c6JDAnjzmVUElNUTdL 8Mlgg7tV2CvEUAXKyTVY4k7ly0cWA/NlemBPvIh131SdsU+y0Dtz/bjsl8+kBKPl0kxsWC 17hIhPQKnhg9cT88YBDcyrhMEhi2EEaae4p0Cl2+Xy4R1bHwHkzfji561F+86/6PNv7irQ voldqRH7NMzUwKwx4Wto4VzQTtcgqaeRiUsmGXGZN94rxzwi6AGGHxxSbz9dEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=aa5d673c529491a01ede1c91aad67b2762f8f4bc commit aa5d673c529491a01ede1c91aad67b2762f8f4bc Author: Cy Schubert AuthorDate: 2021-12-22 05:11:44 +0000 Commit: Cy Schubert CommitDate: 2022-02-07 13:55:12 +0000 ipfilter userland: Fix whitespace errors Replace leading spaces with a tabs on affected lines. (cherry picked from commit 5e13b104a4083c022162a06ffab4f37e7e93aa45) --- sbin/ipf/ipfstat/ipfstat.c | 2 +- sbin/ipf/ipftest/md5.c | 14 +++++++------- sbin/ipf/ippool/ippool.c | 2 +- sbin/ipf/ipsend/44arp.c | 4 ++-- sbin/ipf/ipsend/arp.c | 4 ++-- sbin/ipf/ipsend/ip.c | 14 +++++++------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c index 424e93da2d20..ccf2e12442bb 100644 --- a/sbin/ipf/ipfstat/ipfstat.c +++ b/sbin/ipf/ipfstat/ipfstat.c @@ -1487,7 +1487,7 @@ static void topipstates(i6addr_t saddr, i6addr_t daddr, int sport, int dport, getmaxyx(stdscr, maxy, maxx); redraw = 1; handle_resize = 0; - } + } /* stop program? */ if (handle_break) diff --git a/sbin/ipf/ipftest/md5.c b/sbin/ipf/ipftest/md5.c index b9e8ff99de82..d27430b1f212 100644 --- a/sbin/ipf/ipftest/md5.c +++ b/sbin/ipf/ipftest/md5.c @@ -143,10 +143,10 @@ void MD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen) /* transform if necessary */ if (mdi == 0x40) { for (i = 0, ii = 0; i < 16; i++, ii += 4) - in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | - (((UINT4)mdContext->in[ii+2]) << 16) | - (((UINT4)mdContext->in[ii+1]) << 8) | - ((UINT4)mdContext->in[ii]); + in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | + (((UINT4)mdContext->in[ii+2]) << 16) | + (((UINT4)mdContext->in[ii+1]) << 8) | + ((UINT4)mdContext->in[ii]); Transform (mdContext->buf, in); mdi = 0; } @@ -177,9 +177,9 @@ void MD5Final (unsigned char hash[], MD5_CTX *mdContext) /* append length in bits and transform */ for (i = 0, ii = 0; i < 14; i++, ii += 4) in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | - (((UINT4)mdContext->in[ii+2]) << 16) | - (((UINT4)mdContext->in[ii+1]) << 8) | - ((UINT4)mdContext->in[ii]); + (((UINT4)mdContext->in[ii+2]) << 16) | + (((UINT4)mdContext->in[ii+1]) << 8) | + ((UINT4)mdContext->in[ii]); Transform (mdContext->buf, in); /* store buffer in digest */ diff --git a/sbin/ipf/ippool/ippool.c b/sbin/ipf/ippool/ippool.c index 12c9c85800d5..2d09b67e918c 100644 --- a/sbin/ipf/ippool/ippool.c +++ b/sbin/ipf/ippool/ippool.c @@ -1089,7 +1089,7 @@ setnodeaddr(int type, int role, void *ptr, char *arg) } else if (type == IPLT_HASH) { iphtent_t *node = ptr; - node->ipe_family = family; + node->ipe_family = family; node->ipe_unit = role; #ifdef USE_INET6 diff --git a/sbin/ipf/ipsend/44arp.c b/sbin/ipf/ipsend/44arp.c index f949c77614cc..17188adfb7f8 100644 --- a/sbin/ipf/ipsend/44arp.c +++ b/sbin/ipf/ipsend/44arp.c @@ -37,8 +37,8 @@ */ int resolve(char *host, char *address) { - struct hostent *hp; - u_long add; + struct hostent *hp; + u_long add; add = inet_addr(host); if (add == -1) diff --git a/sbin/ipf/ipsend/arp.c b/sbin/ipf/ipsend/arp.c index 82df2e694e17..47b1702bdad3 100644 --- a/sbin/ipf/ipsend/arp.c +++ b/sbin/ipf/ipsend/arp.c @@ -36,8 +36,8 @@ static const char rcsid[] = "@(#)$Id$"; */ int resolve(char *host, char *address) { - struct hostent *hp; - u_long add; + struct hostent *hp; + u_long add; add = inet_addr(host); if (add == -1) diff --git a/sbin/ipf/ipsend/ip.c b/sbin/ipf/ipsend/ip.c index 7e24e459f8c3..96fa83ada601 100644 --- a/sbin/ipf/ipsend/ip.c +++ b/sbin/ipf/ipsend/ip.c @@ -337,15 +337,15 @@ send_packet(int nfd, int mtu, ip_t *ip, struct in_addr gwip) ip_t *ip; struct in_addr gwip; { - switch (ip->ip_p) - { - case IPPROTO_TCP : + switch (ip->ip_p) + { + case IPPROTO_TCP : ( return send_tcp(nfd, mtu, ip, gwip)); - case IPPROTO_UDP : + case IPPROTO_UDP : ( return send_udp(nfd, mtu, ip, gwip)); - case IPPROTO_ICMP : + case IPPROTO_ICMP : ( return send_icmp(nfd, mtu, ip, gwip)); - default : + default : ( return send_ip(nfd, mtu, ip, gwip, 1)); - } + } }