From 67813438a7dc5381474aa8ffa268d8757157fa11 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 29 Aug 2001 00:45:23 +0000
Subject: [PATCH] kill some warnings

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10587 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/libtelnet/enc_des.c | 2 ++
 appl/telnet/telnet/commands.c   | 3 ++-
 appl/telnet/telnet/externs.h    | 3 +++
 appl/telnet/telnet/main.c       | 7 +++++--
 appl/telnet/telnet/sys_bsd.c    | 3 +--
 appl/telnet/telnet/utilities.c  | 2 --
 appl/telnet/telnetd/ext.h       | 5 +++++
 appl/telnet/telnetd/sys_term.c  | 2 --
 appl/telnet/telnetd/telnetd.c   | 5 ++++-
 appl/telnet/telnetd/termstat.c  | 4 +---
 10 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c
index 42de2e5ba..d6412020e 100644
--- a/appl/telnet/libtelnet/enc_des.c
+++ b/appl/telnet/libtelnet/enc_des.c
@@ -128,6 +128,8 @@ int fb64_reply (unsigned char *, int, struct fb *);
 static void fb64_session (Session_Key *, int, struct fb *);
 void fb64_stream_key (des_cblock, struct stinfo *);
 int fb64_keyid (int, unsigned char *, int *, struct fb *);
+void fb64_printsub(unsigned char *, int ,
+		   unsigned char *, int , char *);
 
 void cfb64_init(int server)
 {
diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index 8583819a7..bf0f9fb48 100644
--- a/appl/telnet/telnet/commands.c
+++ b/appl/telnet/telnet/commands.c
@@ -350,11 +350,12 @@ send_wontcmd(char *name)
     return(send_tncmd(send_wont, "wont", name));
 }
 
+extern char *telopts[];		/* XXX */
+
 static int
 send_tncmd(void (*func)(), char *cmd, char *name)
 {
     char **cpp;
-    extern char *telopts[];
     int val = 0;
 
     if (isprefix(name, "help") || isprefix(name, "?")) {
diff --git a/appl/telnet/telnet/externs.h b/appl/telnet/telnet/externs.h
index 200a0addd..b4c7d08ab 100644
--- a/appl/telnet/telnet/externs.h
+++ b/appl/telnet/telnet/externs.h
@@ -95,6 +95,8 @@ extern char
     dont[],
     will[],
     wont[],
+    do_dont_resp[],
+    will_wont_resp[],
     options[],		/* All the little options */
     *hostname;		/* Who are we connected to? */
 #if	defined(ENCRYPTION)
@@ -433,3 +435,4 @@ extern int linemode;
 #ifdef KLUDGELINEMODE
 extern int kludgelinemode;
 #endif
+extern int want_status_response;
diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index 8b318e13b..b28657528 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -134,6 +134,11 @@ krb5_init(void)
 }
 #endif
 
+#if defined(AUTHENTICATION) && defined(KRB4)
+extern char *dest_realm, dst_realm_buf[];
+extern int dst_realm_sz;
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -264,8 +269,6 @@ main(int argc, char **argv)
 		case 'k':
 #if defined(AUTHENTICATION) && defined(KRB4)
 		    {
-			extern char *dest_realm, dst_realm_buf[];
-			extern int dst_realm_sz;
 			dest_realm = dst_realm_buf;
 			strlcpy(dest_realm, optarg, dst_realm_sz);
 		    }
diff --git a/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c
index 19f9451eb..822b38299 100644
--- a/appl/telnet/telnet/sys_bsd.c
+++ b/appl/telnet/telnet/sys_bsd.c
@@ -491,9 +491,8 @@ TerminalNewMode(int f)
 	}
     } else {
         sigset_t sm;
-#ifdef	SIGINFO
-	RETSIGTYPE ayt_status(int);
 
+#ifdef	SIGINFO
 	signal(SIGINFO, ayt_status);
 #endif
 #ifdef	SIGTSTP
diff --git a/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c
index 6c1759bb2..5ec4ccc6e 100644
--- a/appl/telnet/telnet/utilities.c
+++ b/appl/telnet/telnet/utilities.c
@@ -176,7 +176,6 @@ void
 optionstatus(void)
 {
     int i;
-    extern char will_wont_resp[], do_dont_resp[];
 
     for (i = 0; i < 256; i++) {
 	if (do_dont_resp[i]) {
@@ -254,7 +253,6 @@ printsub(int direction, unsigned char *pointer, int length)
 {
     int i;
     unsigned char buf[512];
-    extern int want_status_response;
 
     if (showoptions || direction == 0 ||
 	(want_status_response && (pointer[0] == TELOPT_STATUS))) {
diff --git a/appl/telnet/telnetd/ext.h b/appl/telnet/telnetd/ext.h
index 3b9b0ab69..65d82c2ee 100644
--- a/appl/telnet/telnetd/ext.h
+++ b/appl/telnet/telnetd/ext.h
@@ -182,6 +182,11 @@ extern struct clocks_t clocks;
 extern int log_unauth;
 extern int no_warn;
 
+extern int def_tspeed, def_rspeed;
+#ifdef	TIOCSWINSZ
+extern int def_row, def_col;
+#endif
+
 #ifdef STREAMSPTY
 extern int really_stream;
 #endif
diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index 87a2ae858..8938d6c6e 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -825,8 +825,6 @@ void getptyslave(void)
     int t = -1;
 
     struct winsize ws;
-    extern int def_row, def_col;
-    extern int def_tspeed, def_rspeed;
     /*
      * Opening the slave side may cause initilization of the
      * kernel tty structure.  We need remember the state of
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index 3aa3dd484..e870e62d5 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -138,6 +138,10 @@ char valid_opts[] = "Bd:hklnS:u:UL:y"
 
 static void doit(struct sockaddr*, int);
 
+#ifdef ENCRYPTION
+extern int des_check_key;
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -150,7 +154,6 @@ main(int argc, char **argv)
     int tos = -1;
 #endif
 #ifdef ENCRYPTION
-    extern int des_check_key;
     des_check_key = 1;	/* Kludge for Mac NCSA telnet 2.6 /bg */
 #endif
     pfrontp = pbackp = ptyobuf;
diff --git a/appl/telnet/telnetd/termstat.c b/appl/telnet/telnetd/termstat.c
index 69981fd83..77d113525 100644
--- a/appl/telnet/telnetd/termstat.c
+++ b/appl/telnet/telnetd/termstat.c
@@ -49,7 +49,7 @@ int def_row = 0, def_col = 0;
  * Check for changes to flow control
  */
 void
-flowstat()
+flowstat(void)
 {
     if (his_state_is_will(TELOPT_LFLOW)) {
 	if (tty_flowmode() != flowmode) {
@@ -81,8 +81,6 @@ flowstat()
 void
 clientstat(int code, int parm1, int parm2)
 {
-    void netflush();
-
     /*
      * Get a copy of terminal characteristics.
      */