aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2021-12-22 03:09:23 +0000
committerCy Schubert <cy@FreeBSD.org>2022-01-04 02:06:44 +0000
commit27fc223414670ecd20d3c6f375fc48a3cd31c889 (patch)
tree9d3bfec5abceeb1fe03b67a21dcae793ca1e48c8
parent00a5b8c3d98df6c51cc8e0ec1e86c7363744bf7c (diff)
ipfilter userland: Remove trailing whitespace
MFC after: 1 month
-rw-r--r--sbin/ipf/ipf/bpf-ipf.h10
-rw-r--r--sbin/ipf/ipfstat/ipfstat.c2
-rw-r--r--sbin/ipf/ipftest/ip_fil.c2
-rw-r--r--sbin/ipf/ipnat/ipnat_y.y2
-rw-r--r--sbin/ipf/ippool/ippool.c6
-rw-r--r--sbin/ipf/ippool/ippool_y.y2
-rw-r--r--sbin/ipf/libipf/ipf_dotuning.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/sbin/ipf/ipf/bpf-ipf.h b/sbin/ipf/ipf/bpf-ipf.h
index a114949de6e0..2350e6cf0692 100644
--- a/sbin/ipf/ipf/bpf-ipf.h
+++ b/sbin/ipf/ipf/bpf-ipf.h
@@ -6,7 +6,7 @@
*
* This code is derived from the Stanford/CMU enet packet filter,
* (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
+ * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
* Berkeley Laboratory.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,8 +55,8 @@ typedef int bpf_int32;
typedef u_int bpf_u_int32;
/*
- * Alignment macros. BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
+ * Alignment macros. BPF_WORDALIGN rounds up to the next
+ * even multiple of BPF_ALIGNMENT.
*/
#ifndef __NetBSD__
#define BPF_ALIGNMENT sizeof(bpf_int32)
@@ -76,7 +76,7 @@ struct bpf_program {
u_int bf_len;
struct bpf_insn *bf_insns;
};
-
+
/*
* Struct returned by BIOCGSTATS.
*/
@@ -86,7 +86,7 @@ struct bpf_stat {
};
/*
- * Struct return by BIOCVERSION. This represents the version number of
+ * Struct return by BIOCVERSION. This represents the version number of
* the filter language described by the instruction encodings below.
* bpf understands a program iff kernel_major == filter_major &&
* kernel_minor >= filter_minor, that is, if the value returned by the
diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c
index a6d782c4f7c9..424e93da2d20 100644
--- a/sbin/ipf/ipfstat/ipfstat.c
+++ b/sbin/ipf/ipfstat/ipfstat.c
@@ -15,7 +15,7 @@
#endif
#include "ipf.h"
#include "netinet/ipl.h"
-#if defined(STATETOP)
+#if defined(STATETOP)
# if defined(sun) && defined(__SVR4)
# include <sys/select.h>
# endif
diff --git a/sbin/ipf/ipftest/ip_fil.c b/sbin/ipf/ipftest/ip_fil.c
index 0fb59a88f977..78791e2b27d4 100644
--- a/sbin/ipf/ipftest/ip_fil.c
+++ b/sbin/ipf/ipftest/ip_fil.c
@@ -267,7 +267,7 @@ get_unit(name, family)
} else {
old_ifneta = ifneta;
nifs++;
- ifneta = (struct ifnet **)reallocarray(ifneta, nifs + 1,
+ ifneta = (struct ifnet **)reallocarray(ifneta, nifs + 1,
sizeof(ifp));
if (!ifneta) {
free(old_ifneta);
diff --git a/sbin/ipf/ipnat/ipnat_y.y b/sbin/ipf/ipnat/ipnat_y.y
index 9f8eb841f7d4..175026b4083e 100644
--- a/sbin/ipf/ipnat/ipnat_y.y
+++ b/sbin/ipf/ipnat/ipnat_y.y
@@ -819,7 +819,7 @@ to: IPNY_TO { yyexpectaddr = 1; }
;
ifnames:
- ifname family { yyexpectaddr = 1; }
+ ifname family { yyexpectaddr = 1; }
| ifname ',' otherifname family { yyexpectaddr = 1; }
;
diff --git a/sbin/ipf/ippool/ippool.c b/sbin/ipf/ippool/ippool.c
index d5e090759057..12c9c85800d5 100644
--- a/sbin/ipf/ippool/ippool.c
+++ b/sbin/ipf/ippool/ippool.c
@@ -1080,7 +1080,7 @@ setnodeaddr(int type, int role, void *ptr, char *arg)
node->ipn_addr.adf_len = offsetof(addrfamily_t,
adf_addr) +
sizeof(struct in6_addr);
- inet_pton(AF_INET6, arg,
+ inet_pton(AF_INET6, arg,
&node->ipn_addr.adf_addr.in6.s6_addr);
}
#endif
@@ -1099,12 +1099,12 @@ setnodeaddr(int type, int role, void *ptr, char *arg)
node->ipe_mask.in4.s_addr = mask.s_addr;
#ifdef USE_INET6
} else {
- inet_pton(AF_INET6, arg,
+ inet_pton(AF_INET6, arg,
&node->ipe_addr.in6.__u6_addr.__u6_addr32);
node->ipe_mask.in6.__u6_addr.__u6_addr32[0] =
mask.s_addr;
node->ipe_mask.in6.__u6_addr.__u6_addr32[1] =
- node->ipe_mask.in6.__u6_addr.__u6_addr32[2] =
+ node->ipe_mask.in6.__u6_addr.__u6_addr32[2] =
node->ipe_mask.in6.__u6_addr.__u6_addr32[3] = 0;
}
#endif
diff --git a/sbin/ipf/ippool/ippool_y.y b/sbin/ipf/ippool/ippool_y.y
index 9e01318a78c7..c798ff50596b 100644
--- a/sbin/ipf/ippool/ippool_y.y
+++ b/sbin/ipf/ippool/ippool_y.y
@@ -376,7 +376,7 @@ addrmask:
sizeof($$[1].adf_addr.in6));
else
#endif
- memset(&$$[1].adf_addr, 0xff,
+ memset(&$$[1].adf_addr, 0xff,
sizeof($$[1].adf_addr.in4));
}
;
diff --git a/sbin/ipf/libipf/ipf_dotuning.c b/sbin/ipf/libipf/ipf_dotuning.c
index c7064cfbefef..1db47d76eac1 100644
--- a/sbin/ipf/libipf/ipf_dotuning.c
+++ b/sbin/ipf/libipf/ipf_dotuning.c
@@ -28,7 +28,7 @@ void ipf_dotuning(int fd, char *tuneargs, ioctlfunc_t iocfn)
if (!strcmp(s, "list")) {
while (1) {
if ((*iocfn)(fd, SIOCIPFGETNEXT, &obj) == -1) {
- ipf_perror_fd(fd, iocfn,
+ ipf_perror_fd(fd, iocfn,
"ioctl(SIOCIPFGETNEXT)");
break;
}
@@ -44,7 +44,7 @@ void ipf_dotuning(int fd, char *tuneargs, ioctlfunc_t iocfn)
strncpy(tu.ipft_name, s, sizeof(tu.ipft_name));
if (sscanf(t, "%lu", &tu.ipft_vlong) == 1) {
if ((*iocfn)(fd, SIOCIPFSET, &obj) == -1) {
- ipf_perror_fd(fd, iocfn,
+ ipf_perror_fd(fd, iocfn,
"ioctl(SIOCIPFSET)");
return;
}