Damn. The previous mega-commit was incomplete WRT ANSIfication. This

fixes that.

7 files changed, 14 insertions, 37 deletions

diff --git a/contrib/telnet/libtelnet/auth-proto.h b/contrib/telnet/libtelnet/auth-proto.h
index 0bcc0b6..6d3ba7f 100644
--- a/contrib/telnet/libtelnet/auth-proto.h
+++ b/contrib/telnet/libtelnet/auth-proto.h
@@ -54,14 +54,6 @@
  * or implied warranty.
  */
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
 #ifdef	AUTHENTICATION
 
 Authenticator *findauthenticator(int, int);
diff --git a/contrib/telnet/libtelnet/enc-proto.h b/contrib/telnet/libtelnet/enc-proto.h
index a132962..46663c7 100644
--- a/contrib/telnet/libtelnet/enc-proto.h
+++ b/contrib/telnet/libtelnet/enc-proto.h
@@ -53,13 +53,6 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
 
 #ifdef	ENCRYPTION
 void encrypt_init(const char *, int);
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c
index 93392a7..5ac693b 100644
--- a/contrib/telnet/libtelnet/enc_des.c
+++ b/contrib/telnet/libtelnet/enc_des.c
@@ -116,14 +116,14 @@ struct keyidlist {
 #define	FB64_IV_BAD	3
 
 
-void fb64_stream_iv P((Block, struct stinfo *));
-void fb64_init P((struct fb *));
-static int fb64_start P((struct fb *, int, int));
-int fb64_is P((unsigned char *, int, struct fb *));
-int fb64_reply P((unsigned char *, int, struct fb *));
-static void fb64_session P((Session_Key *, int, struct fb *));
-void fb64_stream_key P((Block, struct stinfo *));
-int fb64_keyid P((int, unsigned char *, int *, struct fb *));
+void fb64_stream_iv(Block, struct stinfo *);
+void fb64_init(struct fb *);
+static int fb64_start(struct fb *, int, int);
+int fb64_is(unsigned char *, int, struct fb *);
+int fb64_reply(unsigned char *, int, struct fb *);
+static void fb64_session(Session_Key *, int, struct fb *);
+void fb64_stream_key(Block, struct stinfo *);
+int fb64_keyid(int, unsigned char *, int *, struct fb *);
 
 void
 cfb64_init(int server __unused)
diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c
index d57fd7f..9dffefd 100644
--- a/contrib/telnet/libtelnet/encrypt.c
+++ b/contrib/telnet/libtelnet/encrypt.c
@@ -76,8 +76,8 @@ static const char sccsid[] = "@(#)encrypt.c	8.2 (Berkeley) 5/30/95";
  * These functions pointers point to the current routines
  * for encrypting and decrypting data.
  */
-void	(*encrypt_output) P((unsigned char *, int));
-int	(*decrypt_input) P((int));
+void	(*encrypt_output)(unsigned char *, int);
+int	(*decrypt_input)(int);
 
 int EncryptType(char *type, char *mode);
 int EncryptStart(char *mode);
diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c
index a6805b8..39b2dd5 100644
--- a/contrib/telnet/libtelnet/kerberos.c
+++ b/contrib/telnet/libtelnet/kerberos.c
@@ -72,8 +72,8 @@ static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
 #include "auth.h"
 #include "misc.h"
 
-int kerberos4_cksum P((unsigned char *, int));
-int kuserok P((AUTH_DAT *, char *));
+int kerberos4_cksum(unsigned char *, int);
+int kuserok(AUTH_DAT *, char *);
 
 extern int auth_debug_mode;
 
diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c
index 8b21def..e0530f6 100644
--- a/contrib/telnet/libtelnet/krb4encpwd.c
+++ b/contrib/telnet/libtelnet/krb4encpwd.c
@@ -87,8 +87,8 @@ static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
 #include "auth.h"
 #include "misc.h"
 
-int krb_mk_encpwd_req P((KTEXT, char *, char *, char *, char *, char *, char *));
-int krb_rd_encpwd_req P((KTEXT, char *, char *, u_long, AUTH_DAT *, char *, char *, char *, char *));
+int krb_mk_encpwd_req(KTEXT, char *, char *, char *, char *, char *, char *);
+int krb_rd_encpwd_req(KTEXT, char *, char *, u_long, AUTH_DAT *, char *, char *, char *, char *);
 
 extern auth_debug_mode;
 
diff --git a/contrib/telnet/libtelnet/misc-proto.h b/contrib/telnet/libtelnet/misc-proto.h
index 5f4f9fc..aea753c 100644
--- a/contrib/telnet/libtelnet/misc-proto.h
+++ b/contrib/telnet/libtelnet/misc-proto.h
@@ -57,14 +57,6 @@
 #ifndef	__MISC_PROTO__
 #define	__MISC_PROTO__
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
 void auth_encrypt_init(char *, char *, const char *, int);
 void auth_encrypt_connect(int);
 void printd(const unsigned char *, int);