* state.c: Declate doclientstat() static and conditionalize

        inclusion if LINEMODE defined.

        * sys_term.c: Declare getptyslave() and addard() static.

        * telnetd.c: Declare _gettermname() and getterminaltype()
          static.

        * utility.c: Declare putstr() and nextitem() static.

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

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index d14399e0a75ade6df6b65be1769c0e25b7122e70..5a3de7537f1e873e11f7eddf429f100ecba4e787 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,14 @@
+2001-07-01  Ezra Peisach  <epeisach@mit.edu>
+
+       * state.c: Declate doclientstat() static and conditionalize
+       inclusion if LINEMODE defined. 
+
+       * sys_term.c: Declare getptyslave() and addard() static.
+
+       * telnetd.c: Declare _gettermname() and getterminaltype() static.
+
+       * utility.c: Declare putstr() and nextitem() static.
+
 2001-06-22  Ezra Peisach  <epeisach@mit.edu>
 
        * telnetd.c (main): Change variable sin to sin4.

diff --git a/src/appl/telnet/telnetd/state.c b/src/appl/telnet/telnetd/state.c
index 66f2738cbc7d47dc516db037c7692f641cb1f447..a115b7483fedac15846ecfa3615c9f567f4f146a 100644 (file)
--- a/src/appl/telnet/telnetd/state.c
+++ b/src/appl/telnet/telnetd/state.c
@@ -476,7 +476,7 @@ send_do(option, init)
 extern void auth_request();
 #endif
 #ifdef LINEMODE
-extern void doclientstat();
+static void doclientstat(void);
 #endif
 #ifdef ENCRYPTION
 extern void encrypt_send_support();
@@ -1538,11 +1538,13 @@ suboption()
 
 }  /* end of suboption */
 
-       void
+#ifdef LINEMODE
+static void
 doclientstat()
 {
        clientstat(TELOPT_LINEMODE, WILL, 0);
 }
+#endif
 
 #define        ADD(c)   *ncp++ = c;
 #define        ADD_DATA(c) { *ncp++ = c; if (c == SE) *ncp++ = c; }

diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 18251b6ceb80a5761dda1a46dd78d7b9a5eb2736..7905a29fba4eec1559c29e124175071dbd270d81 100644 (file)
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -194,6 +194,7 @@ int ttyfd = -1;
 #endif
 
 int dup_tty(int);
+static char **addarg(char **, char *);
 
 /*
  * init_termbuf()
@@ -906,7 +907,7 @@ tty_isnewmap()
  * that is necessary.  The return value is a file descriptor
  * for the slave side.
  */
-void
+static void
 getptyslave()
 {
      int t = -1;
@@ -1216,7 +1217,6 @@ start_login(host, autologin, name)
        char *name;
 {
        register char **argv;
-       char **addarg();
        extern char *getenv();
 
 #ifdef SOLARIS
@@ -1409,7 +1409,7 @@ start_login(host, autologin, name)
        /*NOTREACHED*/
 }
 
-       char **
+static char **
 addarg(argv, val)
        register char **argv;
        register char *val;

diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index 29c8f6aaa5c8938fb1f31530db8548b94d2a011a..b1ee54c008a41e64f9e7bdba5a42102dd863b560 100644 (file)
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -136,6 +136,7 @@ char        ptyibuf2[BUFSIZ];
 
 void doit P((struct sockaddr_in *));
 int terminaltypeok P((char *));
+static void _gettermname(void);
 
 int    hostinfo = 1;                   /* do we print login banner? */
 
@@ -707,12 +708,11 @@ static unsigned char ttytype_sbbuf[] = {
        IAC, SB, TELOPT_TTYPE, TELQUAL_SEND, IAC, SE
 };
 
-    int
+static int
 getterminaltype(name)
     char *name;
 {
     int retval = -1;
-    void _gettermname();
 
     settimer(baseline);
 #if    defined(AUTHENTICATION)
@@ -889,7 +889,7 @@ getterminaltype(name)
     return(retval);
 }  /* end of getterminaltype */
 
-    void
+static void
 _gettermname()
 {
     /*

diff --git a/src/appl/telnet/telnetd/utility.c b/src/appl/telnet/telnetd/utility.c
index dea7b97e5997863fc5bddae6820d1179dc55abc7..dabeeb4ae8dcf4a93618eb381966b98030e02798 100644 (file)
--- a/src/appl/telnet/telnetd/utility.c
+++ b/src/appl/telnet/telnetd/utility.c
@@ -151,7 +151,7 @@ ptyflush()
  * if the current address is a TELNET IAC ("I Am a Command")
  * character.
  */
-    char *
+static char *
 nextitem(current)
     char       *current;
 {
@@ -430,7 +430,7 @@ edithost(pat, host)
 
 static char *putlocation;
 
-       void
+static void
 putstr(s)
        register char *s;
 {