ansi; khalek@linuxgamers.net

1 files changed, 11 insertions, 15 deletions

diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 45f864270c1..3cefbd70acf 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.57 2003/12/16 21:46:22 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.58 2004/07/20 03:50:26 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #if !defined(lint) && !defined(SMALL)
-static char rcsid[] = "$OpenBSD: main.c,v 1.57 2003/12/16 21:46:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.58 2004/07/20 03:50:26 deraadt Exp $";
 #endif /* not lint and not SMALL */
 
 /*
@@ -324,7 +324,7 @@ main(volatile int argc, char *argv[])
 }
 
 void
-intr()
+intr(void)
 {
 
 	alarmtimer(0);
@@ -332,7 +332,7 @@ intr()
 }
 
 void
-lostpeer()
+lostpeer(void)
 {
 	int save_errno = errno;
 
@@ -368,7 +368,7 @@ lostpeer()
  * Generate a prompt
  */
 char *
-prompt()
+prompt(void)
 {
 	return ("ftp> ");
 }
@@ -377,8 +377,7 @@ prompt()
  * Command parser.
  */
 void
-cmdscanner(top)
-	int top;
+cmdscanner(int top)
 {
 	struct cmd *c;
 	int num;
@@ -473,8 +472,7 @@ cmdscanner(top)
 }
 
 struct cmd *
-getcmd(name)
-	const char *name;
+getcmd(const char *name)
 {
 	const char *p, *q;
 	struct cmd *c, *found;
@@ -511,7 +509,7 @@ getcmd(name)
 int slrflag;
 
 void
-makeargv()
+makeargv(void)
 {
 	char *argp;
 
@@ -554,7 +552,7 @@ makeargv()
  * handle quoting and strings
  */
 char *
-slurpstring()
+slurpstring(void)
 {
 	int got_one = 0;
 	char *sb = stringbase;
@@ -686,9 +684,7 @@ OUT:
  * Call each command handler with argc == 0 and argv[0] == name.
  */
 void
-help(argc, argv)
-	int argc;
-	char *argv[];
+help(int argc, char *argv[])
 {
 	struct cmd *c;
 
@@ -724,7 +720,7 @@ help(argc, argv)
 }
 
 void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr,
 	    "usage: %s [-46AadegimnptVv] [-P port] [-r seconds] [host [port]]\n"