telnet used a P macro instead of __P -- g/c that too.

5 files changed, 35 insertions, 38 deletions

diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index a4654846439..37877930b09 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commands.c,v 1.40 2002/02/16 21:27:54 millert Exp $	*/
+/*	$OpenBSD: commands.c,v 1.41 2002/02/17 17:20:49 millert Exp $	*/
 /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
 
 /*
@@ -232,12 +232,12 @@ struct sendlist {
 
 
 static int
-	send_esc P((void)),
-	send_help P((void)),
-	send_docmd P((char *)),
-	send_dontcmd P((char *)),
-	send_willcmd P((char *)),
-	send_wontcmd P((char *));
+	send_esc(void),
+	send_help(void),
+	send_docmd(char *),
+	send_dontcmd(char *),
+	send_willcmd(char *),
+	send_wontcmd(char *);
 
 static struct sendlist Sendlist[] = {
     { "ao",	"Send Telnet Abort output",		1, 0, 0, 2, AO },
@@ -602,15 +602,15 @@ togxbinary(val)
 }
 
 
-static int togglehelp P((void));
+static int togglehelp(void);
 #if	defined(AUTHENTICATION)
-extern int auth_togdebug P((int));
+extern int auth_togdebug(int);
 #endif
 #if    defined(ENCRYPTION)
-extern int EncryptAutoEnc P((int));
-extern int EncryptAutoDec P((int));
-extern int EncryptDebug P((int));
-extern int EncryptVerbose P((int));
+extern int EncryptAutoEnc(int);
+extern int EncryptAutoDec(int);
+extern int EncryptDebug(int);
+extern int EncryptVerbose(int);
 #endif
 
 
@@ -1539,7 +1539,7 @@ struct envlist {
 	int	narg;
 };
 
-static void	env_help P((void));
+static void	env_help(void);
 
 struct envlist EnvList[] = {
     { "define",	"Define an environment variable",
@@ -1887,7 +1887,7 @@ struct authlist {
 };
 
 static int
-	auth_help P((void));
+	auth_help(void);
 
 struct authlist AuthList[] = {
     { "status",	"Display current status of authentication information",
diff --git a/usr.bin/telnet/defines.h b/usr.bin/telnet/defines.h
index 038efc0bb20..6287b6deb63 100644
--- a/usr.bin/telnet/defines.h
+++ b/usr.bin/telnet/defines.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defines.h,v 1.4 1998/05/15 03:16:37 art Exp $	*/
+/*	$OpenBSD: defines.h,v 1.5 2002/02/17 17:20:49 millert Exp $	*/
 /*	$NetBSD: defines.h,v 1.5 1996/02/28 21:03:55 thorpej Exp $	*/
 
 /*
@@ -65,5 +65,5 @@
 
 #define MODE_OUT8      0x8000 /* binary mode sans -opost */
 
-void upcase P((register char *));
+void upcase(register char *);
 
diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h
index 04c5b0f22bd..7e898681cfa 100644
--- a/usr.bin/telnet/externs.h
+++ b/usr.bin/telnet/externs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: externs.h,v 1.7 2001/07/04 15:21:02 pvalchev Exp $	*/
+/*	$OpenBSD: externs.h,v 1.8 2002/02/17 17:20:49 millert Exp $	*/
 /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */
 
 /*
@@ -451,8 +451,8 @@ extern char
     *transcom;         /* Transparent command */
 
 extern int
-    settranscom P((int, char**));
+    settranscom(int, char**);
 
 extern void
-    inputAvailable P((int));
+    inputAvailable(int);
 #endif /* defined(TN3270) */
diff --git a/usr.bin/telnet/ring.h b/usr.bin/telnet/ring.h
index 97ff777fabf..50ae730e61e 100644
--- a/usr.bin/telnet/ring.h
+++ b/usr.bin/telnet/ring.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ring.h,v 1.4 1998/05/15 03:16:42 art Exp $	*/
+/*	$OpenBSD: ring.h,v 1.5 2002/02/17 17:20:49 millert Exp $	*/
 /*	$NetBSD: ring.h,v 1.5 1996/02/28 21:04:09 thorpej Exp $	*/
 
 /*
@@ -36,9 +36,6 @@
  *	from: @(#)ring.h	8.1 (Berkeley) 6/6/93
  */
 
-#include <sys/cdefs.h>
-#define P __P
-
 /*
  * This defines a structure for a ring buffer.
  *
@@ -68,27 +65,27 @@ typedef struct {
 
 /* Initialization routine */
 extern int
-	ring_init P((Ring *ring, unsigned char *buffer, int count));
+	ring_init(Ring *ring, unsigned char *buffer, int count);
 
 /* Data movement routines */
 extern void
-	ring_supply_data P((Ring *ring, unsigned char *buffer, int count));
+	ring_supply_data(Ring *ring, unsigned char *buffer, int count);
 #ifdef notdef
 extern void
-	ring_consume_data P((Ring *ring, unsigned char *buffer, int count));
+	ring_consume_data(Ring *ring, unsigned char *buffer, int count);
 #endif
 
 /* Buffer state transition routines */
 extern void
-	ring_supplied P((Ring *ring, int count)),
-	ring_consumed P((Ring *ring, int count));
+	ring_supplied(Ring *ring, int count),
+	ring_consumed(Ring *ring, int count);
 
 /* Buffer state query routines */
 extern int
-	ring_empty_count P((Ring *ring)),
-	ring_empty_consecutive P((Ring *ring)),
-	ring_full_count P((Ring *ring)),
-	ring_full_consecutive P((Ring *ring));
+	ring_empty_count(Ring *ring),
+	ring_empty_consecutive(Ring *ring),
+	ring_full_count(Ring *ring),
+	ring_full_consecutive(Ring *ring);
 
 #if    defined(ENCRYPTION)
 extern void
@@ -98,9 +95,9 @@ extern void
 
 
 extern void
-    ring_clear_mark P((Ring *)),
-    ring_mark P((Ring *));
+    ring_clear_mark(Ring *),
+    ring_mark(Ring *);
 
 
 extern int
-    ring_at_mark P((Ring *));
+    ring_at_mark(Ring *);
diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c
index 3e8585ad91c..9b0b1c82dcc 100644
--- a/usr.bin/telnet/telnet.c
+++ b/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: telnet.c,v 1.13 2001/11/19 19:02:16 mpech Exp $	*/
+/*	$OpenBSD: telnet.c,v 1.14 2002/02/17 17:20:49 millert Exp $	*/
 /*	$NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $	*/
 
 /*
@@ -538,7 +538,7 @@ dontoption(option)
  * bad, duplicate, or verbose names (names with spaces).
  */
 
-int is_unique P((char *, char **, char **));
+int is_unique(char *, char **, char **);
 
 static char *name_unknown = "UNKNOWN";
 static char *unknown[] = { 0, 0 };