Very large style makeover.

1) ANSIfy.
2) Clean up ifdefs so that
   a) ones that never/always apply are appropriately either
      fully removed, or just the #if junk is removed.
   b) change #if defined(FOO) for appropiate values of FOO.
      (currently AUTHENTICATION and ENCRYPTION)
3) WARNS=2 fixing
4) GC other unused stuff

This code can now be unifdef(1)ed to make non-crypto telnet.

1 files changed, 12 insertions, 13 deletions

diff --git a/crypto/telnet/telnetd/ext.h b/crypto/telnet/telnetd/ext.h
index 9b53c7c..d9becde 100644
--- a/crypto/telnet/telnetd/ext.h
+++ b/crypto/telnet/telnetd/ext.h
@@ -56,10 +56,7 @@ extern int	diagnostic;	/* telnet diagnostic capabilities */
 #ifdef BFTPDAEMON
 extern int	bftpd;		/* behave as bftp daemon */
 #endif /* BFTPDAEMON */
-#if	defined(SecurID)
-extern int	require_SecurID;
-#endif
-#if	defined(AUTHENTICATION)
+#ifdef	AUTHENTICATION
 extern int	auth_level;
 #endif
 
@@ -93,12 +90,12 @@ extern int	SYNCHing;		/* we are in TELNET SYNCH mode */
 
 extern void
 	_termstat P((void)),
-	add_slc P((int, int, int)),
+	add_slc P((char, char, cc_t)),
 	check_slc P((void)),
-	change_slc P((int, int, int)),
+	change_slc P((char, char, cc_t)),
 	cleanup P((int)),
 	clientstat P((int, int, int)),
-	copy_termbuf P((char *, int)),
+	copy_termbuf P((char *, size_t)),
 	deferslc P((void)),
 	defer_terminit P((void)),
 	do_opt_slc P((unsigned char *, int)),
@@ -106,8 +103,8 @@ extern void
 	dooption P((int)),
 	dontoption P((int)),
 	edithost P((char *, char *)),
-	fatal P((int, char *)),
-	fatalperror P((int, char *)),
+	fatal P((int, const char *)),
+	fatalperror P((int, const char *)),
 	get_slc_defaults P((void)),
 	init_env P((void)),
 	init_termbuf P((void)),
@@ -117,10 +114,11 @@ extern void
 	netclear P((void)),
 	netflush P((void)),
 #ifdef DIAGNOSTICS
-	printoption P((char *, int)),
-	printdata P((char *, char *, int)),
-	printsub P((int, unsigned char *, int)),
+	printoption P((const char *, int)),
+	printdata P((const char *, char *, int)),
+	printsub P((char, unsigned char *, int)),
 #endif
+	process_slc P((unsigned char, unsigned char, cc_t)),
 	ptyflush P((void)),
 	putchr P((int)),
 	putf P((char *, char *)),
@@ -136,7 +134,7 @@ extern void
 	set_termbuf P((void)),
 	start_login P((char *, int, char *)),
 	start_slc P((int)),
-#if	defined(AUTHENTICATION)
+#ifdef	AUTHENTICATION
 	start_slave P((char *)),
 #else
 	start_slave P((char *, int, char *)),
@@ -186,6 +184,7 @@ extern void
 
 int	output_data __P((const char *, ...)) __printflike(1, 2);
 void	output_datalen __P((const char *, int));
+void	startslave __P((char *, int, char *));
 
 #ifdef	ENCRYPTION
 extern void	(*encrypt_output) P((unsigned char *, int));