More egcs warning fixes:

	o main returns int not void
	o use return 0 at end of main when needed
	o use braces to avoid potentially ambiguous else
	o don't default to type int (and also remove a useless register
	  modifier).

Reviewed by: obrien and chuckr

7 files changed, 19 insertions, 14 deletions

diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index b4cace6..ed0dee3 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id: bootpd.c,v 1.10 1998/12/13 21:02:28 eivind Exp $
+	$Id: bootpd.c,v 1.11 1999/04/07 08:27:39 brian Exp $
 
 ************************************************************************/
 
@@ -183,7 +183,7 @@ char *bootpd_dump = DUMPTAB_FILE;
  * main server loop is started.
  */
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
@@ -573,6 +573,7 @@ main(argc, argv)
 			break;
 		}
 	}
+	return 0;
 }
 
 
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
index c289352..b552eb3 100644
--- a/libexec/bootpd/bootpgw/bootpgw.c
+++ b/libexec/bootpd/bootpgw/bootpgw.c
@@ -153,7 +153,7 @@ char *hostname;
  * main server loop is started.
  */
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
@@ -494,6 +494,7 @@ main(argc, argv)
 			break;
 		}
 	}
+	return 0;
 }
 
 
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index c7e9276..c459ac8 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.c
+++ b/libexec/bootpd/tools/bootpef/bootpef.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id$
+	$Id: bootpef.c,v 1.4 1997/02/22 14:21:18 peter Exp $
 
 ************************************************************************/
 
@@ -136,7 +136,7 @@ usage()
  * Initialization such as command-line processing is done and then the
  * main server loop is started.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
@@ -272,6 +272,7 @@ main(argc, argv)
 		mktagfile(hp);
 		hp = (struct host *) hash_NextEntry(nmhashtable);
 	}
+	return (0);
 }
 
 
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 92a3837..d319426 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -31,7 +31,7 @@
  * 09/28/93 Released version 1.0
  * 09/93 Original developed by Gordon W. Ross <gwr@mc.com>
  *
- *	$Id: bootptest.c,v 1.4 1997/02/22 14:21:20 peter Exp $
+ *	$Id: bootptest.c,v 1.5 1997/12/24 18:56:03 imp Exp $
  */
 
 char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
@@ -127,7 +127,7 @@ extern void bootp_print();
  * the receiver loop is started.  Die when interrupted.
  */
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index aaa1e7d..4f58d69 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: ftpd.c,v 1.53 1999/04/06 23:05:57 brian Exp $";
+	"$Id: ftpd.c,v 1.54 1999/04/07 08:27:40 brian Exp $";
 #endif /* not lint */
 
 /*
@@ -423,11 +423,12 @@ main(argc, argv, envp)
 
 			fd = open(pid_file, O_CREAT | O_WRONLY | O_TRUNC
 				| O_NONBLOCK | O_EXLOCK, 0644);
-			if (fd < 0)
+			if (fd < 0) {
 				if (errno == EAGAIN)
 					errx(1, "%s: file locked", pid_file);
 				else
 					err(1, "%s", pid_file);
+			}
 			snprintf(buf, sizeof(buf),
 				"%lu\n", (unsigned long) getpid());
 			if (write(fd, buf, strlen(buf)) < 0)
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 9974ed6..8740d14 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rlogind.c,v 1.21 1999/04/06 23:05:58 brian Exp $";
+	"$Id: rlogind.c,v 1.22 1999/04/07 08:27:42 brian Exp $";
 #endif /* not lint */
 
 /*
@@ -382,7 +382,7 @@ protocol(f, p)
 	register int f, p;
 {
 	char pibuf[1024+1], fibuf[1024], *pbp, *fbp;
-	register pcc = 0, fcc = 0;
+	int pcc = 0, fcc = 0;
 	int cc, nfd, n;
 	char cntl;
 
@@ -413,12 +413,13 @@ protocol(f, p)
 			omask = &obits;
 		} else
 			FD_SET(f, &ibits);
-		if (pcc >= 0)
+		if (pcc >= 0) {
 			if (pcc) {
 				FD_SET(f, &obits);
 				omask = &obits;
 			} else
 				FD_SET(p, &ibits);
+		}
 		FD_SET(p, &ebits);
 		if ((n = select(nfd, &ibits, omask, &ebits, 0)) < 0) {
 			if (errno == EINTR)
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index dcb3b0e..9c422e9 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uucpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: uucpd.c,v 1.17 1999/04/06 23:06:00 brian Exp $";
+	"$Id: uucpd.c,v 1.18 1999/04/07 08:27:45 brian Exp $";
 #endif /* not lint */
 
 /*
@@ -102,7 +102,7 @@ void dologout(void);
 int readline(char start[], int num, int passw);
 void dologin(struct passwd *pw, struct sockaddr_in *sin);
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	environ = nenv;
 	close(1); close(2);