From: Ken Raeburn <raeburn@mit.edu>
Date: Thu, 30 Aug 2001 03:44:03 +0000 (+0000)
Subject: * telnet.c (setupterm): Now static.
X-Git-Tag: krb5-1.3-alpha1~1121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff9c40af952539623b50dc0f0e3630917a71e4cd;p=krb5.git

* telnet.c (setupterm): Now static.
(suboption): Rename local variable "ospeed" to "o_speed" to avoid conflict with
global.
(env_opt_add): Cast opt_welldefined argument to char * to silence warning.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13697 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index e1f6d8c47..33e667bb4 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* telnet.c (setupterm): Now static.
+	(suboption): Rename local variable "ospeed" to "o_speed" to avoid
+	conflict with global.
+	(env_opt_add): Cast opt_welldefined argument to char * to silence
+	warning.
+
 2001-07-08  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Add AC_HEADER_STDARG.
diff --git a/src/appl/telnet/telnet/telnet.c b/src/appl/telnet/telnet/telnet.c
index 628b556b6..c0fe34b15 100644
--- a/src/appl/telnet/telnet/telnet.c
+++ b/src/appl/telnet/telnet/telnet.c
@@ -773,7 +773,7 @@ is_unique(name, as, ae)
 char termbuf[1024];
 
 	/*ARGSUSED*/
-	int
+static int
 setupterm(tname, fd, errp)
 	char *tname;
 	int fd, *errp;
@@ -879,14 +879,14 @@ suboption()
 	if (SB_EOF())
 	    return;
 	if (SB_GET() == TELQUAL_SEND) {
-	    long ospeed, ispeed;
+	    long o_speed, ispeed;
 	    unsigned char temp[50];
 	    int len;
 
-	    TerminalSpeeds(&ispeed, &ospeed);
+	    TerminalSpeeds(&ispeed, &o_speed);
 
 	    sprintf((char *)temp, "%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
-		    TELQUAL_IS, ospeed, ispeed, IAC, SE);
+		    TELQUAL_IS, o_speed, ispeed, IAC, SE);
 	    len = strlen((char *)temp+4) + 4;	/* temp[3] is 0 ... */
 
 	    if (len < NETROOM()) {
@@ -1675,7 +1675,7 @@ env_opt_add(ep)
 		opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
 		opt_replyend = opt_reply + len;
 	}
-	if (opt_welldefined(ep))
+	if (opt_welldefined((char *) ep))
 #ifdef	OLD_ENVIRON
 		if (telopt_environ == TELOPT_OLD_ENVIRON)
 			*opt_replyp++ = old_env_var;