From ebe70c8f689aca6d1c8800d98f0582f6213cf129 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 25 Apr 1999 22:33:30 +0000
Subject: [PATCH] More egcs warning fixes: 	o main returns int not void 
 o use braces to avoid potentially ambiguous else

Note: The fix to natd is potentially functional in nature since I used
the indentation as the right thing rather than the struct semantics.
Someone more familiar with the code should double check me on this one.

Reviewed by: obrien and chuckr
---
 sbin/fsdb/fsdb.c |  4 ++--
 sbin/natd/natd.c | 10 +++++-----
 sbin/ping/ping.c |  5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 423a160bf424..007b76230881 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fsdb.c,v 1.10 1998/06/15 07:12:19 charnier Exp $";
+	"$Id: fsdb.c,v 1.11 1998/11/09 03:43:55 truckman Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -69,7 +69,7 @@ char nflag = 0;
  * fsreadfd is set up to read from the file system, fswritefd to write to
  * the file system.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index fd7ea110a5ec..12452c099753 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- *	$Id: natd.c,v 1.13 1999/03/24 20:30:48 brian Exp $
+ *	$Id: natd.c,v 1.14 1999/03/30 10:11:21 brian Exp $
  */
 
 #define SYSLOG_NAMES
@@ -480,14 +480,14 @@ static void DoAliasing (int fd, int direction)
  * This is a IP packet.
  */
 	ip = (struct ip*) packetBuf;
-	if (direction == DONT_KNOW)
+	if (direction == DONT_KNOW) {
 		if (packetAddr.sin_addr.s_addr == INADDR_ANY)
 			direction = OUTPUT;
 		else
 			direction = INPUT;
+	}
 
 	if (verbose) {
-		
 /*
  * Print packet direction and protocol type.
  */
@@ -1406,10 +1406,10 @@ void SetupPortRedirect (const char* parms)
 	ptr = strtok (NULL, " \t");
 	if (ptr) {
 		separator = strchr (ptr, ':');
-		if (separator)
+		if (separator) {
 		        if (StrToAddrAndPortRange (ptr, &remoteAddr, protoName, &portRange) != 0)
 			        errx (1, "redirect_port: invalid remote port range");
-		else {
+		} else {
 		        SETLOPORT(portRange, 0);
 			SETNUMPORTS(portRange, 1);
 			StrToAddr (ptr, &remoteAddr);
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index b1e20e8dec80..6e4124137197 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: ping.c,v 1.41 1998/08/26 18:51:37 des Exp $";
+	"$Id: ping.c,v 1.42 1999/01/06 07:54:28 imp Exp $";
 #endif /* not lint */
 
 /*
@@ -1013,13 +1013,14 @@ finish()
 	(void)printf("%ld packets received, ", nreceived);
 	if (nrepeats)
 		(void)printf("+%ld duplicates, ", nrepeats);
-	if (ntransmitted)
+	if (ntransmitted) {
 		if (nreceived > ntransmitted)
 			(void)printf("-- somebody's printing up packets!");
 		else
 			(void)printf("%d%% packet loss",
 			    (int) (((ntransmitted - nreceived) * 100) /
 			    ntransmitted));
+	}
 	(void)putchar('\n');
 	if (nreceived && timing) {
 		double n = nreceived + nrepeats;