From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 12 Mar 2015 21:33:36 +0000 (-0700)
Subject: ipfw2 - Final whitespace cleanup
X-Git-Tag: v4.2.0rc~575
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/e2b4b25e0dab91f77f51cf10bd58da6c99698d18

ipfw2 - Final whitespace cleanup

* Do final cleanup of a few more whitespace issues
---

diff --git a/lib/libipfw2/dummynet/ipfw2_dummynet.c b/lib/libipfw2/dummynet/ipfw2_dummynet.c
index e6edd98cb2..1dfb022786 100644
--- a/lib/libipfw2/dummynet/ipfw2_dummynet.c
+++ b/lib/libipfw2/dummynet/ipfw2_dummynet.c
@@ -89,4 +89,3 @@ load_module(register_func function, register_keyword keyword)
 	function(MODULE_DUMMYNET_ID,O_DUMMYNET_QUEUE,
 			(parser_func)parse_queue, (shower_func)show_queue);
 }
-
diff --git a/sys/net/ipfw2_nat/ip_fw2_nat.h b/sys/net/ipfw2_nat/ip_fw2_nat.h
index b3bde46e95..27c5ea086e 100644
--- a/sys/net/ipfw2_nat/ip_fw2_nat.h
+++ b/sys/net/ipfw2_nat/ip_fw2_nat.h
@@ -98,8 +98,8 @@ struct cfg_nat {
 
 /* Nat command. */
 typedef struct	_ipfw_insn_nat {
- 	ipfw_insn	o;
- 	struct cfg_nat *nat;
+	ipfw_insn	o;
+	struct cfg_nat *nat;
 } ipfw_insn_nat;
 
 #define LOOKUP_NAT(l, i, p) do {			\
diff --git a/sys/net/libalias/alias.c b/sys/net/libalias/alias.c
index b1c8f0f430..4749c67c4f 100644
--- a/sys/net/libalias/alias.c
+++ b/sys/net/libalias/alias.c
@@ -1250,7 +1250,7 @@ LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize)
 		case IPPROTO_TCP:
 			iresult = TcpAliasIn(la, pip);
 			break;
- 		case IPPROTO_GRE: {
+		case IPPROTO_GRE: {
 			int error;
 			struct alias_data ad = {
 				.lnk = NULL,
@@ -1392,7 +1392,7 @@ LibAliasOutLocked(struct libalias *la, char *ptr,	/* valid IP packet */
 			case IPPROTO_TCP:
 			iresult = TcpAliasOut(la, pip, maxpacketsize, create);
 			break;
- 		case IPPROTO_GRE: {
+		case IPPROTO_GRE: {
 			int error;
 			struct alias_data ad = {
 				.lnk = NULL,
@@ -1406,11 +1406,11 @@ LibAliasOutLocked(struct libalias *la, char *ptr,	/* valid IP packet */
 			/* Walk out chain. */
 			error = find_handler(OUT, IP, la, pip, &ad);
 			if (error == 0)
- 				iresult = PKT_ALIAS_OK;
- 			else
- 				iresult = ProtoAliasOut(la, pip, create);
+				iresult = PKT_ALIAS_OK;
+			else
+				iresult = ProtoAliasOut(la, pip, create);
 		}
- 			break;
+			break;
 		default:
 			iresult = ProtoAliasOut(la, pip, create);
 			break;
diff --git a/sys/net/libalias/alias_nbt.c b/sys/net/libalias/alias_nbt.c
index 1170703230..322431cfe9 100644
--- a/sys/net/libalias/alias_nbt.c
+++ b/sys/net/libalias/alias_nbt.c
@@ -114,7 +114,7 @@ protohandler2in(struct libalias *la, struct ip *pip, struct alias_data *ah)
 {
 
 	AliasHandleUdpNbtNS(la, pip, ah->lnk, ah->aaddr, ah->aport,
- 			    ah->oaddr, ah->dport);
+			    ah->oaddr, ah->dport);
 	return (0);
 }
 
@@ -123,7 +123,7 @@ protohandler2out(struct libalias *la, struct ip *pip, struct alias_data *ah)
 {
 
 	AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport,
- 			    ah->aaddr, ah->aport);
+			    ah->aaddr, ah->aport);
 	return (0);
 }
 
diff --git a/sys/net/libalias/alias_smedia.c b/sys/net/libalias/alias_smedia.c
index c2e6ca7fef..ce248e022d 100644
--- a/sys/net/libalias/alias_smedia.c
+++ b/sys/net/libalias/alias_smedia.c
@@ -155,7 +155,7 @@ protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah)
 
 	if (ntohs(*ah->dport) == TFTP_PORT_NUMBER)
 		FindRtspOut(la, pip->ip_src, pip->ip_dst,
- 			    *ah->sport, *ah->aport, IPPROTO_UDP);
+			    *ah->sport, *ah->aport, IPPROTO_UDP);
 	else AliasHandleRtspOut(la, pip, ah->lnk, ah->maxpktsize);
 	return (0);
 }