The branch main has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5e13b104a4083c022162a06ffab4f37e7e93aa45
commit 5e13b104a4083c022162a06ffab4f37e7e93aa45
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2021-12-22 05:11:44 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2022-01-04 02:06:44 +0000
ipfilter userland: Fix whitespace errors
Replace leading spaces with a tabs on affected lines.
MFC after: 1 month
---
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));
- }
+ }
}
