From nobody Mon Feb 07 13:52:03 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 15D0219AAE17; Mon, 7 Feb 2022 13:52:05 +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 4Jsnd03gs7z4yGR; Mon, 7 Feb 2022 13:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644241925; 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=k62t52yTYt7J9kXXFlLQtG2bpUcGPmGPubMN2WBTo6I=; b=GNms5KAhadjKll161pKKALPkM9TKGFr5SYzSfYDjhKndwaonKX4ram2Eq7yYIBgOBF2e/9 XfRINlkOWtwC0lFD1hrhGRdiJLbgv48RzPY+6fvCX8XwuIG/pLfEp+8QQftQY/ujQel/XA 5OixU1tgT8WIXA0lZkTvoct6o7Vwq2FWzDCVjM6G2mUXGfUp6y1PqFwt0ZOxIJmW857C+v u96MVjBZAvXQL0fa+byDJI6p9YwqKBt1UhkdkFw2yeOEUXByAlkE/8lyRFXw969SyWJ7oa Oa7AZT+VBRIgNdsxB8P9niHZcCHrZc/SMuOXDlHOcNMo7prMlt9ByNwSEwLirQ== 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 ACF9526C61; Mon, 7 Feb 2022 13:52:03 +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 217Dq38l079634; Mon, 7 Feb 2022 13:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217Dq3we079633; Mon, 7 Feb 2022 13:52:03 GMT (envelope-from git) Date: Mon, 7 Feb 2022 13:52:03 GMT Message-Id: <202202071352.217Dq3we079633@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: 7d986069537c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7d986069537c8b63d02d504d6b3875f49ed47005 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644241925; 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=k62t52yTYt7J9kXXFlLQtG2bpUcGPmGPubMN2WBTo6I=; b=RxWRf/hChfIFkO8xneJMy+qtzfy7Srq8dQosZyDqUKQRlmGRh/wYjqzaRfqcJ2X/BTb7SW zY1dHG2nLgGBPM6xgsX0M+u25yLSAswuWrmsYkcgMke+3HQOMSAfmQTah+VTYdLsDQjr+f Tz9H6q2BlDjykf1HmP7rL2N/ssfLL/l2Gfoo5J1ux+EpNbOFgZifdh+DYfV+S+MEFHGLWR V5P1z5m67nDRlfuKAXUdZcoSw69N7GgV/wU08VMjIODGrDEebFRRSgdNWpy5mYBKYv4+sW 3uDdsuE3Q5+G+7iati92SGVsuMvtDHb3KvvTBmKCwa2pXspKqoNHUiZMvJjxVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644241925; a=rsa-sha256; cv=none; b=c/RSPhov3QbRyoFTQTiMAk0VRSx2xU0xIOt+BvRQFNFWqvScf74wBzk1JSF3zfNPZOHGkc lYg9eaIbgBsAHTR2qTM/3cd9F1LLWy6718mrQnQHtMMO2NtxS83fY2nOnzPYjNhVCKxa3G F7eJdUIyY/brjHEsFGw5R4DpWsxE4AL5jNdu+8IjWEqZ5Lxu3g/6vWpf/HvZVy11ofMG7L seAGgTzLYGcIf93XRhPG4nACebZE860N8aGx1bWkssbhLipYAvrQKsTV5C0CQ4IJk5S6AE /4SwwVOGSfd/XTCSuLeQe19p0AsaGk/LxyPvaYnBNXBs0D0ZlMg9CsapbPp9QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7d986069537c8b63d02d504d6b3875f49ed47005 commit 7d986069537c8b63d02d504d6b3875f49ed47005 Author: Cy Schubert AuthorDate: 2021-12-22 05:11:44 +0000 Commit: Cy Schubert CommitDate: 2022-02-07 13:51:16 +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)); - } + } }