Fix bug that was uncovered by adding correct prototypes and

remove lots of names from func declarations. ok dhill@

3 files changed, 36 insertions, 36 deletions

diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 48f8aad7fd1..c6123f3b3c6 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.22 2006/03/16 19:32:46 deraadt Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.23 2006/03/16 21:13:12 moritz Exp $	*/
 /*	$NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.22 2006/03/16 19:32:46 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: cmds.c,v 1.23 2006/03/16 21:13:12 moritz Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -54,9 +54,9 @@ char	null = '\0';
 char	*sep[] = { "second", "minute", "hour" };
 static char *argv[10];		/* argument vector for take and put */
 
-void	timeout();		/* timeout function called on alarm */
-void	stopsnd();		/* SIGINT handler during file transfers */
-void	intcopy();		/* interrupt routine for file transfers */
+void	timeout(int);		/* timeout function called on alarm */
+void	stopsnd(int);		/* SIGINT handler during file transfers */
+void	intcopy(int);		/* interrupt routine for file transfers */
 
 /*
  * FTP - remote ==> local
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 9347383a468..daa4b2ef53d 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.h,v 1.19 2006/03/16 19:32:46 deraadt Exp $	*/
+/*	$OpenBSD: tip.h,v 1.20 2006/03/16 21:13:12 moritz Exp $	*/
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
 
 /*
@@ -269,43 +269,44 @@ extern	int disc;		/* current tty discpline */
 
 extern	char *__progname;	/* program name */
 
-extern	char *ctrl(char c);
+extern	char *ctrl(char);
 extern	char *vinterp(char *, int);
 extern	char *con(void);
 
-char	*sname(char *s);
-int	any(int cc, char *p);
-int	anyof(char *s1, char *s2);
-int	args(char *buf, char *a[], int num);
+char	*sname(char *);
+char	*interp(char *);
+int	any(int, char *);
+int	anyof(char *, char *);
+int	args(char *, char **, int);
 int	escape(void);
-int	prompt(char *s, char *p, size_t sz);
-int	size(char *s);
-int	ttysetup(int speed);
-int	uu_lock(char *ttyname);
-int	uu_unlock(char *ttyname);
-int	vstring(char *s, char *v);
-long	hunt(char *name);
-void	cumain(int argc, char *argv[]);
+int	prompt(char *, char *, size_t);
+int	size(char *);
+int	ttysetup(int);
+int	uu_lock(char *);
+int	uu_unlock(char *);
+int	vstring(char *, char *);
+long	hunt(char *);
+void	cumain(int, char **);
 void	daemon_uid(void);
-void	disconnect(char *reason);
-void	execute(char *s);
-void	hardwareflow(char *option);
-void	logent(char *group, char *num, char *acu, char *message);
+void	disconnect(char *);
+void	execute(char *);
+void	hardwareflow(char *);
+void	logent(char *, char *, char *, char *);
 void	loginit(void);
-void	prtime(char *s, time_t a);
-void	parwrite(int fd, char *buf, int n);
+void	prtime(char *, time_t);
+void	parwrite(int, char *, int);
 void	raw(void);
-void	send(int c);
-void	setparity(char *defparity);
+void	send(int);
+void	setparity(char *);
 void	setscript(void);
 void	shell_uid(void);
-void	tandem(char *option);
-void	tipabort(char *msg);
+void	tandem(char *);
+void	tipabort(char *);
 void	tipin(void);
 void	tipout(void);
-void	transfer(char *buf, int fd, char *eofchars);
-void	transmit(FILE *fd, char *eofchars, char *command);
+void	transfer(char *, int, char *);
+void	transmit(FILE *, char *, char *);
 void	unraw(void);
 void	user_uid(void);
 void	vinit(void);
-void	vlex(char *s);
+void	vlex(char *);
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 9829200ccb2..b3c7fc4ddc0 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: value.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $	*/
+/*	$OpenBSD: value.c,v 1.12 2006/03/16 21:13:12 moritz Exp $	*/
 /*	$NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] = "$OpenBSD: value.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: value.c,v 1.12 2006/03/16 21:13:12 moritz Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -199,7 +199,6 @@ vtoken(char *s)
 static void
 vprint(value_t *p)
 {
-	extern char *interp();
 	char *cp;
 
 	if (col > 0 && col < MIDDLE)
@@ -220,7 +219,7 @@ vprint(value_t *p)
 		printf("%s=", p->v_name);
 		col++;
 		if (p->v_value) {
-			cp = interp(p->v_value, NULL);
+			cp = interp(p->v_value);
 			col += size(cp);
 			printf("%s", cp);
 		}