* 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 e1f6d8c47a129a94421f342537b56ab85cc18752..33e667bb4c29a85d6d30d6429cf7d061bc3f7e5a 100644 (file)
--- 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 628b556b600a7f161d88c5454a7fc68de69d6b60..c0fe34b15fde67f6a0a2f2997509ab2e0f6ccaee 100644 (file)
--- 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;