maint: Remove uses of the 'register' keyword.

* libicmp/*.c: Don't use the 'register' keyword when declaring variables or arguments. * libinetutils/*.c: Likewise. * libtelnet/*.h: Likewise. * libtelnet/*.c: Likewise. * src/*.c: Likewise. * talk/*.c: Likewise. * telnet/*.c: Likewise. * telnetd/*.c: Likewise.
2026-01-12 00:19:39 +08:00 · 2024-05-08 21:07:41 -07:00
parent e5a9384c92
commit 711242da5b
29 changed files with 202 additions and 203 deletions
--- a/libicmp/icmp_cksum.c
+++ b/libicmp/icmp_cksum.c
@@ -24,7 +24,7 @@
 unsigned short
 icmp_cksum (unsigned char *addr, int len)
 {
-  register int sum = 0;
+  int sum = 0;
  unsigned short answer = 0;
  unsigned short *wp;

--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -93,7 +93,7 @@ des_clear_key ()
 int
 des_read (fd, buf, len)
     int fd;
-     register char *buf;
+     char *buf;
     int len;
 {
  int nreturned = 0;
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -154,9 +154,9 @@ readit (FILE *file, struct tftphdr **dpp, int convert)
 void
 read_ahead (FILE *file, int convert)
 {
-  register int i;
-  register char *p;
-  register int c;
+  int i;
+  char *p;
+  int c;
  struct bf *b;
  struct tftphdr *dp;

@@ -228,9 +228,9 @@ write_behind (FILE *file, int convert)
 {
  char *buf;
  int count;
-  register int ct;
-  register char *p;
-  register int c;		/* current character */
+  int ct;
+  char *p;
+  int c;			/* current character */
  struct bf *b;
  struct tftphdr *dp;

--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -75,7 +75,7 @@ inetutils_ttymsg (struct iovec *iov, int iovcnt, char *line, int tmout)
 {
  static char errbuf[MAX_ERRBUF];
  char *device;
-  register int cnt, fd, left, wret;
+  int cnt, fd, left, wret;
  struct iovec localiov[6];
  int forked = 0;

--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -286,7 +286,7 @@ auth_disable_name (char *name)
 int
 getauthmask (char *type, int *maskp)
 {
-  register int x;
+  int x;

  if (AUTHTYPE_NAME (0) && !strcasecmp (type, AUTHTYPE_NAME (0)))
    {
@@ -631,8 +631,8 @@ auth_sendname (char *name, int len)
 {
  static unsigned char str_request[256 + 6]
    = { IAC, SB, TELOPT_AUTHENTICATION, TELQUAL_NAME, };
-  register unsigned char *e = str_request + 4;
-  register unsigned char *ee = &str_request[sizeof (str_request) - 2];
+  unsigned char *e = str_request + 4;
+  unsigned char *ee = &str_request[sizeof (str_request) - 2];
  unsigned char *cp = (unsigned char *) name;

  while (--len >= 0)
@@ -709,7 +709,7 @@ auth_debug (int mode)
 static void
 auth_gen_printsub (unsigned char *data, int cnt, char *buf, int buflen)
 {
-  register char *cp;
+  char *cp;
  char tbuf[16];

  cnt -= 3;
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -185,7 +185,7 @@ ofb64_init (int server)
       /* ENCTYPE_DES_OFB64 */

 static void
-fb64_init (register struct fb *fbp)
+fb64_init (struct fb *fbp)
 {
  memset ((void *) fbp, 0, sizeof (*fbp));
  fbp->state[0] = fbp->state[1] = FAILED;
@@ -223,7 +223,7 @@ fb64_start (struct fb *fbp, int dir, int server)
 {
  size_t x;
  unsigned char *p;
-  register int state;
+  int state;

  switch (dir)
    {
@@ -314,7 +314,7 @@ static int
 fb64_is (unsigned char *data, int cnt, struct fb *fbp)
 {
  unsigned char *p;
-  register int state = fbp->state[DIR_DECRYPT - 1];
+  int state = fbp->state[DIR_DECRYPT - 1];

  if (cnt-- < 1)
    goto failure;
@@ -406,7 +406,7 @@ ofb64_reply (unsigned char *data, int cnt)
 static int
 fb64_reply (unsigned char *data, int cnt, struct fb *fbp)
 {
-  register int state = fbp->state[DIR_ENCRYPT - 1];
+  int state = fbp->state[DIR_ENCRYPT - 1];

  if (cnt-- < 1)
    goto failure;
@@ -555,7 +555,7 @@ ofb64_keyid (int dir, unsigned char *kp, int *lenp)
 static int
 fb64_keyid (int dir, unsigned char *kp, int *lenp, struct fb *fbp)
 {
-  register int state = fbp->state[dir - 1];
+  int state = fbp->state[dir - 1];

  if (*lenp != 1 || (*kp != '\0'))
    {
@@ -578,7 +578,7 @@ fb64_printsub (unsigned char *data, int cnt,
 	       char *buf, int buflen, const char *type)
 {
  char lbuf[32];
-  register int i;
+  int i;
  char *cp;

  buf[buflen - 1] = '\0';	/* make sure it's NULL terminated */
@@ -633,7 +633,7 @@ ofb64_printsub (unsigned char *data, int cnt, char *buf, int buflen)
       /* ENCTYPE_DES_OFB64 */

 static void
-fb64_stream_iv (Block seed, register struct stinfo *stp)
+fb64_stream_iv (Block seed, struct stinfo *stp)
 {

  memmove ((void *) stp->str_iv, (void *) seed, sizeof (Block));
@@ -647,7 +647,7 @@ fb64_stream_iv (Block seed, register struct stinfo *stp)
 }

 static void
-fb64_stream_key (Block key, register struct stinfo *stp)
+fb64_stream_key (Block key, struct stinfo *stp)
 {
  memmove ((void *) stp->str_ikey, (void *) key, sizeof (Block));
 #   ifndef SHISHI
@@ -681,10 +681,10 @@ fb64_stream_key (Block key, register struct stinfo *stp)
 */

 void
-cfb64_encrypt (register unsigned char *s, int c)
+cfb64_encrypt (unsigned char *s, int c)
 {
-  register struct stinfo *stp = &fb[CFB].streams[DIR_ENCRYPT - 1];
-  register int index;
+  struct stinfo *stp = &fb[CFB].streams[DIR_ENCRYPT - 1];
+  int index;

  index = stp->str_index;
  while (c-- > 0)
@@ -713,7 +713,7 @@ cfb64_encrypt (register unsigned char *s, int c)
 int
 cfb64_decrypt (int data)
 {
-  register struct stinfo *stp = &fb[CFB].streams[DIR_DECRYPT - 1];
+  struct stinfo *stp = &fb[CFB].streams[DIR_DECRYPT - 1];
  int index;

  if (data == -1)
@@ -770,10 +770,10 @@ cfb64_decrypt (int data)
 */
 #   ifdef ENCTYPE_DES_OFB64
 void
-ofb64_encrypt (register unsigned char *s, int c)
+ofb64_encrypt (unsigned char *s, int c)
 {
-  register struct stinfo *stp = &fb[OFB].streams[DIR_ENCRYPT - 1];
-  register int index;
+  struct stinfo *stp = &fb[OFB].streams[DIR_ENCRYPT - 1];
+  int index;

  index = stp->str_index;
  while (c-- > 0)
@@ -799,7 +799,7 @@ ofb64_encrypt (register unsigned char *s, int c)
 int
 ofb64_decrypt (int data)
 {
-  register struct stinfo *stp = &fb[OFB].streams[DIR_DECRYPT - 1];
+  struct stinfo *stp = &fb[OFB].streams[DIR_DECRYPT - 1];
  int index;

  if (data == -1)
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -57,10 +57,10 @@
 * the length of *s1 is returned.
 */
 int
-isprefix (register const char *s1, register const char *s2)
+isprefix (const char *s1, const char *s2)
 {
  const char *os1;
-  register char c1, c2;
+  char c1, c2;

  if (*s1 == '\0')
    return (-1);
@@ -84,8 +84,8 @@ static char *ambiguous;		/* special return value for command routines */
 char **
 genget (const char *name, char **table, int stlen)
 {
-  register char **c, **found;
-  register int n;
+  char **c, **found;
+  int n;

  if (name == 0)
    return 0;
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -16,6 +16,6 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see `http://www.gnu.org/licenses/'. */

-int isprefix (register char *s1, register char *s2);
+int isprefix (char *s1, char *s2);
 char **genget (char *name, char **table, int stlen);
 int Ambiguous (char *s);
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -254,7 +254,7 @@ kerberos4_send (ap)
   */
  if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL)
    {
-      register int i;
+      int i;

      des_key_sched (cred.session, sched);
      des_init_random_number_generator (cred.session);
@@ -267,7 +267,7 @@ kerberos4_send (ap)
       */
      for (i = 7; i >= 0; --i)
 	{
-	  register int x;
+	  int x;
 	  x = (unsigned int) challenge[i] + 1;
 	  challenge[i] = x;	/* ignore overflow */
 	  if (x < 256)		/* if no overflow, all done */
@@ -383,7 +383,7 @@ kerberos4_is (ap, data, cnt)
      des_ecb_encrypt (datablock, challenge, sched, 0);
      for (r = 7; r >= 0; r--)
 	{
-	  register int t;
+	  int t;
 	  t = (unsigned int) challenge[r] + 1;
 	  challenge[r] = t;	/* ignore overflow */
 	  if (t < 256)		/* if no overflow, all done */
@@ -503,7 +503,7 @@ kerberos4_printsub (data, cnt, buf, buflen)
     int cnt, buflen;
 {
  char lbuf[32];
-  register int i;
+  int i;

  buf[buflen - 1] = '\0';	/* make sure its NULL terminated */
  buflen -= 1;
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -980,7 +980,7 @@ catch_child (int signo MAYBE_UNUSED)
 void
 writer (void)
 {
-  register int bol, local, n;
+  int bol, local, n;
  char c;

  bol = 1;			/* beginning of line */
@@ -1083,9 +1083,9 @@ writer (void)
 }

 void
-echo (register char c)
+echo (char c)
 {
-  register char *p;
+  char *p;
  char buf[8];

  p = buf;
@@ -1456,7 +1456,7 @@ get_window_size (int fd, struct winsize *wp)
 #endif

 unsigned int
-getescape (register char *p)
+getescape (char *p)
 {
  long val;
  int len;
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1012,7 +1012,7 @@ prevent_routing (int fd, struct auth_data *ap)
 void
 setup_tty (int fd, struct auth_data *ap)
 {
-  register char *cp = strchr (ap->term + ENVSIZE, '/');
+  char *cp = strchr (ap->term + ENVSIZE, '/');
  char *speed;
  struct termios tt;

@@ -1878,7 +1878,7 @@ protocol (int f, int p, struct auth_data *ap)
 	    fcc = 0;
 	  else
 	    {
-	      register char *cp;
+	      char *cp;
 	      int left;

 	      if (fcc <= 0)
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -193,7 +193,7 @@ struct cmd cmdtab[] = {
  {NULL, NULL, NULL}
 };

-struct cmd *getcmd (register char *name);
+struct cmd *getcmd (char *name);
 char *tail (char *filename);


@@ -481,7 +481,7 @@ struct modes
 void
 modecmd (int argc, char *argv[])
 {
-  register struct modes *p;
+  struct modes *p;
  char *sep;

  if (argc < 2)
@@ -542,8 +542,8 @@ void
 put (int argc, char *argv[])
 {
  int fd;
-  register int n;
-  register char *cp, *targ;
+  int n;
+  char *cp, *targ;

  if (argc < 2)
    get_args ("send", "(file) ", &argc, &argv);
@@ -655,8 +655,8 @@ void
 get (int argc, char *argv[])
 {
  int fd;
-  register int n;
-  register char *cp;
+  int n;
+  char *cp;
  char *src;

  if (argc < 2)
@@ -815,7 +815,7 @@ intr (int signo MAYBE_UNUSED)
 char *
 tail (char *filename)
 {
-  register char *s;
+  char *s;

  while (*filename)
    {
@@ -835,7 +835,7 @@ tail (char *filename)
 static void
 command (void)
 {
-  register struct cmd *c;
+  struct cmd *c;

  for (;;)
    {
@@ -869,11 +869,11 @@ command (void)
 }

 struct cmd *
-getcmd (register char *name)
+getcmd (char *name)
 {
-  register char *p, *q;
-  register struct cmd *c, *found;
-  register int nmatches, longest;
+  char *p, *q;
+  struct cmd *c, *found;
+  int nmatches, longest;

  longest = 0;
  nmatches = 0;
@@ -907,8 +907,8 @@ getcmd (register char *name)
 static void
 makeargv (void)
 {
-  register char *cp;
-  register char **argp = margv;
+  char *cp;
+  char **argp = margv;

  margc = 0;
  for (cp = line; *cp;)
@@ -945,7 +945,7 @@ quit (int argc MAYBE_UNUSED, MAYBE_UNUSED char *argv[])
 void
 help (int argc, char *argv[])
 {
-  register struct cmd *c;
+  struct cmd *c;

  if (argc == 1)
    {
@@ -957,7 +957,7 @@ help (int argc, char *argv[])

  while (--argc > 0)
    {
-      register char *arg;
+      char *arg;

      arg = *++argv;
      c = getcmd (arg);
@@ -990,9 +990,9 @@ setverbose (int argc MAYBE_UNUSED, MAYBE_UNUSED char *argv[])
 void
 tftp_sendfile (int fd, char *name, char *mode)
 {
-  register struct tftphdr *ap;	/* data and ack packets */
+  struct tftphdr *ap;		/* data and ack packets */
  struct tftphdr *r_init (void), *dp;
-  register int n;
+  int n;
  volatile int block, size, convert;
  volatile unsigned long amount;
  struct sockaddr_storage from;
@@ -1103,9 +1103,9 @@ abort:
 void
 recvfile (int fd, char *name, char *mode)
 {
-  register struct tftphdr *ap;
+  struct tftphdr *ap;
  struct tftphdr *dp, *w_init (void);
-  register int n;
+  int n;
  volatile int block, size, firsttrip;
  volatile unsigned long amount;
  struct sockaddr_storage from;
@@ -1224,7 +1224,7 @@ static int
 makerequest (int request, const char *name, struct tftphdr *tp,
 	     const char *mode)
 {
-  register char *cp;
+  char *cp;
  size_t arglen, len;

  tp->th_opcode = htons ((unsigned short) request);
@@ -1287,8 +1287,8 @@ struct errmsg
 static void
 nak (int error)
 {
-  register struct errmsg *pe;
-  register struct tftphdr *tp;
+  struct errmsg *pe;
+  struct tftphdr *tp;
  int length;

  tp = (struct tftphdr *) ackbuf;
@@ -1316,7 +1316,7 @@ static void
 tpacket (const char *s, struct tftphdr *tp, int n)
 {
  static char *opcodes[] = { "#0", "RRQ", "WRQ", "DATA", "ACK", "ERROR" };
-  register char *cp, *file;
+  char *cp, *file;
  unsigned short op = ntohs (tp->th_opcode);

  if (op < RRQ || op > ERROR)
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -207,7 +207,7 @@ int
 main (int argc, char *argv[])
 {
  int index;
-  register struct tftphdr *tp;
+  struct tftphdr *tp;
  int on, n;
  struct sockaddr_storage sin;

@@ -434,9 +434,9 @@ struct formats
 void
 tftp (struct tftphdr *tp, int size)
 {
-  register char *cp;
+  char *cp;
  int first = 1, ecode;
-  register struct formats *pf;
+  struct formats *pf;
  char *filename, *mode;

 #if HAVE_STRUCT_TFTPHDR_TH_U
@@ -646,8 +646,8 @@ void
 tftpd_sendfile (struct formats *pf)
 {
  struct tftphdr *dp, *r_init (void);
-  register struct tftphdr *ap;	/* ack packet */
-  register int size, n;
+  struct tftphdr *ap;		/* ack packet */
+  int size, n;
  volatile int block;

  signal (SIGALRM, timer);
@@ -724,8 +724,8 @@ void
 recvfile (struct formats *pf)
 {
  struct tftphdr *dp, *w_init (void);
-  register struct tftphdr *ap;	/* ack buffer */
-  register int n, size;
+  struct tftphdr *ap;		/* ack buffer */
+  int n, size;
  volatile int block;

  signal (SIGALRM, timer);
@@ -826,7 +826,7 @@ static const char *
 errtomsg (int error)
 {
  static char buf[20];
-  register struct errmsg *pe;
+  struct errmsg *pe;
  if (error == 0)
    return "success";
  for (pe = errmsgs; pe->e_code >= 0; pe++)
@@ -845,9 +845,9 @@ errtomsg (int error)
 static void
 nak (int error)
 {
-  register struct tftphdr *tp;
+  struct tftphdr *tp;
  int length;
-  register struct errmsg *pe;
+  struct errmsg *pe;

  tp = (struct tftphdr *) buf;
  tp->th_opcode = htons ((unsigned short) ERROR);
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -166,7 +166,7 @@ main (int argc, char **argv)
 }

 static int
-readline (register char *p, register int n)
+readline (char *p, int n)
 {
  char c;

--- a/talk/display.c
+++ b/talk/display.c
@@ -79,7 +79,7 @@ static int
 readwin (WINDOW *win, int line, int col)
 {
  int oldline, oldcol;
-  register int c;
+  int c;

  getyx (win, oldline, oldcol);
  wmove (win, line, col);
@@ -93,7 +93,7 @@ readwin (WINDOW *win, int line, int col)
 * so that the current position is obvious
 */
 static void
-xscroll (register xwin_t *win, int flag)
+xscroll (xwin_t *win, int flag)
 {
  if (flag == -1)
    {
@@ -116,9 +116,9 @@ xscroll (register xwin_t *win, int flag)
 * characters while we are at it.
 */
 int
-display (register xwin_t *win, register char *text, int size)
+display (xwin_t *win, char *text, int size)
 {
-  register int i;
+  int i;
  unsigned char cch;

  for (i = 0; i < size; i++)
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -73,7 +73,7 @@ get_names (int argc, char *argv[])
  char *his_name, *my_name;
  char *my_machine_name, *his_machine_name;
  char *his_tty;
-  register char *cp;
+  char *cp;

  if ((my_name = getlogin ()) == NULL)
    {
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -87,7 +87,7 @@ int
 check_local (void)
 {
  CTL_RESPONSE response;
-  register CTL_RESPONSE *rp = &response;
+  CTL_RESPONSE *rp = &response;

  /* the rest of msg was set up in get_names */
  msg.ctl_addr.sa_family = htons (ctl_addr.sin_family);
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -117,7 +117,7 @@

 char *hostname = NULL;

-extern int isprefix (register const char *s1, register const char *s2);
+extern int isprefix (const char *s1, const char *s2);
 extern char **genget (const char *, char **, int);
 extern int Ambiguous (void *);

@@ -145,8 +145,8 @@ static void slc_help (int);
 static void
 makeargv (void)
 {
-  register char *cp, *cp2, c;
-  register char **argp = margv;
+  char *cp, *cp2, c;
+  char **argp = margv;

  margc = 0;
  cp = line;
@@ -159,7 +159,7 @@ makeargv (void)
    }
  while ((c = *cp))
    {
-      register int inquote = 0;
+      int inquote = 0;
      while (isspace (c))
 	c = *++cp;
      if (c == '\0')
@@ -218,9 +218,9 @@ makeargv (void)
 */

 static int
-special (register char *s)
+special (char *s)
 {
-  register char c;
+  char c;
  char b;

  switch (*s)
@@ -248,7 +248,7 @@ special (register char *s)
 * for a special character.
 */
 static const char *
-control (register cc_t c)
+control (cc_t c)
 {
  static char buf[5];
  /*
@@ -258,7 +258,7 @@ control (register cc_t c)
   * was to assign "c" to an unsigned int variable...
   * Arggg....
   */
-  register unsigned int uic = (unsigned int) c;
+  unsigned int uic = (unsigned int) c;

  if (uic == 0x7f)
    return ("^?");
@@ -454,11 +454,11 @@ send_tncmd (void (*func) (int, int), char *cmd, const char *name)
 #if !HAVE_DECL_TELOPTS
  extern char *telopts[];
 #endif
-  register int val = 0;
+  int val = 0;

  if (isprefix (name, "help") || isprefix (name, "?"))
    {
-      register int col, len;
+      int col, len;

      printf ("Usage: send %s <value|option>\n", cmd);
      printf ("\"value\" must be from 0 to 255\n");
@@ -496,7 +496,7 @@ send_tncmd (void (*func) (int, int), char *cmd, const char *name)
    }
  else
    {
-      register const char *cp = name;
+      const char *cp = name;

      while (*cp >= '0' && *cp <= '9')
 	{
@@ -1173,7 +1173,7 @@ unsetcmd (int argc, char *argv[])
 {
  struct setlist *ct;
  struct togglelist *c;
-  register char *name;
+  char *name;

  if (argc < 2)
    {
@@ -1516,7 +1516,7 @@ display (int argc, char *argv[])
 static int
 setescape (int argc, char *argv[])
 {
-  register char *arg;
+  char *arg;
  char buf[50];

  printf ("Deprecated usage - please use 'set escape%s%s' in the future.\n",
@@ -1603,7 +1603,7 @@ shell (int argc, MAYBE_UNUSED char *argv[])
 	/*
 	 * Fire up the shell in the child.
 	 */
-	register char *shellp, *shellname;
+	char *shellp, *shellname;

 	shellp = getenv ("SHELL");
 	if (shellp == NULL)
@@ -1870,7 +1870,7 @@ struct env_lst envlisthead;
 struct env_lst *
 env_find (const char *var)
 {
-  register struct env_lst *ep;
+  struct env_lst *ep;

  for (ep = envlisthead.next; ep; ep = ep->next)
    {
@@ -1883,8 +1883,8 @@ env_find (const char *var)
 void
 env_init (void)
 {
-  register char **epp, *cp;
-  register struct env_lst *ep;
+  char **epp, *cp;
+  struct env_lst *ep;

  for (epp = environ; *epp; epp++)
    {
@@ -1934,7 +1934,7 @@ env_init (void)
 struct env_lst *
 env_define (const char *var, char *value)
 {
-  register struct env_lst *ep = env_find (var);
+  struct env_lst *ep = env_find (var);
  if (ep)
    {
      free (ep->var);
@@ -1959,7 +1959,7 @@ env_define (const char *var, char *value)
 struct env_lst *
 env_undefine (const char *var, char *d)
 {
-  register struct env_lst *ep = env_find (var);
+  struct env_lst *ep = env_find (var);
  if (ep)
    {
      ep->prev->next = ep->next;
@@ -1975,7 +1975,7 @@ env_undefine (const char *var, char *d)
 struct env_lst *
 env_export (const char *var, char *d)
 {
-  register struct env_lst *ep = env_find (var);
+  struct env_lst *ep = env_find (var);
  if (ep)
    ep->export = 1;
  return NULL;
@@ -1984,7 +1984,7 @@ env_export (const char *var, char *d)
 struct env_lst *
 env_unexport (const char *var, char *d)
 {
-  register struct env_lst *ep = env_find (var);
+  struct env_lst *ep = env_find (var);
  if (ep)
    ep->export = 0;
  return NULL;
@@ -1993,7 +1993,7 @@ env_unexport (const char *var, char *d)
 struct env_lst *
 env_send (const char *var, char *d)
 {
-  register struct env_lst *ep;
+  struct env_lst *ep;

  if (my_state_is_wont (TELOPT_NEW_ENVIRON)
 #ifdef	OLD_ENVIRON
@@ -2021,7 +2021,7 @@ env_send (const char *var, char *d)
 struct env_lst *
 env_list (const char *d1, char *d2)
 {
-  register struct env_lst *ep;
+  struct env_lst *ep;

  for (ep = envlisthead.next; ep; ep = ep->next)
    {
@@ -2054,7 +2054,7 @@ env_default (int init, int welldefined)
 unsigned char *
 env_getvalue (const char *var)
 {
-  register struct env_lst *ep = env_find (var);
+  struct env_lst *ep = env_find (var);
  if (ep)
    return (ep->value);
  return (NULL);
@@ -2981,7 +2981,7 @@ getcmd (char *name)
 void
 command (int top, char *tbuf, int cnt)
 {
-  register Command *c;
+  Command *c;

  setcommandmode ();
  if (!top)
@@ -3001,7 +3001,7 @@ command (int top, char *tbuf, int cnt)
 	printf ("%s> ", prompt);
      if (tbuf)
 	{
-	  register char *cp;
+	  char *cp;
 	  cp = line;
 	  while (cnt > 0 && (*cp++ = *tbuf++) != '\n')
 	    cnt--;
@@ -3078,7 +3078,7 @@ command (int top, char *tbuf, int cnt)
 static int
 help (int argc, char *argv[])
 {
-  register Command *c;
+  Command *c;

  if (argc == 1)
    {
@@ -3092,7 +3092,7 @@ help (int argc, char *argv[])
    }
  while (--argc > 0)
    {
-      register char *arg;
+      char *arg;
      arg = *++argv;
      c = getcmd (arg);
      if (Ambiguous (c))
@@ -3110,7 +3110,7 @@ static char *rcname = 0;
 static void
 cmdrc (char *m1, char *m2)
 {
-  register Command *c;
+  Command *c;
  FILE *rcfile;
  int gotmachine = 0;
  int l1 = strlen (m1);
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -149,7 +149,7 @@ setneturg (void)
 int
 netflush (void)
 {
-  register int n, n1;
+  int n, n1;

 #ifdef	ENCRYPTION
  if (encrypt_output)
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -297,7 +297,7 @@ TerminalSaveState (void)
 }

 cc_t *
-tcval (register int func)
+tcval (int func)
 {
  switch (func)
    {
@@ -412,7 +412,7 @@ TerminalDefaultChars (void)


 void
-TerminalNewMode (register int f)
+TerminalNewMode (int f)
 {
  static int prevmode = 0;
 #ifndef USE_TERMIO
@@ -865,9 +865,9 @@ void
 TerminalSpeeds (long *ispeed, long *ospeed)
 {
 #ifdef	DECODE_BAUD
-  register struct termspeeds *tp;
+  struct termspeeds *tp;
 #endif /* DECODE_BAUD */
-  register long in, out;
+  long in, out;

  out = cfgetospeed (&old_tc);
  in = cfgetispeed (&old_tc);
@@ -1070,7 +1070,7 @@ int
 process_rings (int netin, int netout, int netex, int ttyin, int ttyout,
 	       int poll)
 {
-  register int c;
+  int c;
  /* One wants to be a bit careful about setting returnValue
   * to one, since a one implies we did some useful work,
   * and therefore probably won't be called to block next
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -219,7 +219,7 @@ init_telnet (void)
 */

 void
-send_do (register int c, register int init)
+send_do (int c, int init)
 {
  if (init)
    {
@@ -235,7 +235,7 @@ send_do (register int c, register int init)
 }

 void
-send_dont (register int c, register int init)
+send_dont (int c, int init)
 {
  if (init)
    {
@@ -251,7 +251,7 @@ send_dont (register int c, register int init)
 }

 void
-send_will (register int c, register int init)
+send_will (int c, int init)
 {
  if (init)
    {
@@ -267,7 +267,7 @@ send_will (register int c, register int init)
 }

 void
-send_wont (register int c, register int init)
+send_wont (int c, int init)
 {
  if (init)
    {
@@ -590,10 +590,10 @@ dontoption (int option)
 }

 int
-is_unique (register char *name, register char **as, register char **ae)
+is_unique (char *name, char **as, char **ae)
 {
-  register char **ap;
-  register int n;
+  char **ap;
+  int n;

  n = strlen (name) + 1;
  for (ap = as; ap < ae; ap++)
@@ -615,8 +615,8 @@ static char *unknown[] = { 0, 0 };
 char **
 mklist (char *buf, char *name)
 {
-  register int n;
-  register char c, *cp, **argvp, *cp2, **argv, **avt;
+  int n;
+  char c, *cp, **argvp, *cp2, **argv, **avt;

  if (name)
    {
@@ -1274,7 +1274,7 @@ static int slc_mode = SLC_EXPORT;
 void
 slc_init (void)
 {
-  register struct spc *spcp;
+  struct spc *spcp;

  localchars = 1;
  for (spcp = spc_data; spcp < &spc_data[NSLC + 1]; spcp++)
@@ -1392,7 +1392,7 @@ slc_import (int def)
 void
 slc_export (void)
 {
-  register struct spc *spcp;
+  struct spc *spcp;

  TerminalDefaultChars ();

@@ -1416,10 +1416,10 @@ slc_export (void)
 }

 void
-slc (register unsigned char *cp, int len)
+slc (unsigned char *cp, int len)
 {
-  register struct spc *spcp;
-  register int func, level;
+  struct spc *spcp;
+  int func, level;

  slc_start_reply ();

@@ -1494,7 +1494,7 @@ slc (register unsigned char *cp, int len)
 void
 slc_check (void)
 {
-  register struct spc *spcp;
+  struct spc *spcp;

  slc_start_reply ();
  for (spcp = &spc_data[1]; spcp < &spc_data[NSLC + 1]; spcp++)
@@ -1541,7 +1541,7 @@ slc_add_reply (unsigned int func, unsigned int flags, cc_t value)
 void
 slc_end_reply (void)
 {
-  register int len;
+  int len;

  *slc_replyp++ = IAC;
  *slc_replyp++ = SE;
@@ -1561,7 +1561,7 @@ slc_end_reply (void)
 int
 slc_update (void)
 {
-  register struct spc *spcp;
+  struct spc *spcp;
  int need_update = 0;

  for (spcp = &spc_data[1]; spcp < &spc_data[NSLC + 1]; spcp++)
@@ -1599,10 +1599,10 @@ int old_env_value = OLD_ENV_VALUE;
 #endif

 void
-env_opt (register unsigned char *buf, register int len)
+env_opt (unsigned char *buf, int len)
 {
-  register unsigned char *ep = 0, *epc = 0;
-  register int i;
+  unsigned char *ep = 0, *epc = 0;
+  int i;

  switch (buf[0] & 0xff)
    {
@@ -1708,9 +1708,9 @@ env_opt_start_info (void)
 }

 void
-env_opt_add (register unsigned char *ep)
+env_opt_add (unsigned char *ep)
 {
-  register unsigned char *vp, c;
+  unsigned char *vp, c;

  if (opt_reply == NULL)
     /*XXX*/ return;
@@ -1731,7 +1731,7 @@ env_opt_add (register unsigned char *ep)
  if (opt_replyp + (vp ? strlen ((char *) vp) : 0) +
      strlen ((char *) ep) + 6 > opt_replyend)
    {
-      register int len;
+      int len;
      opt_replyend += OPT_REPLY_SIZE;
      len = opt_replyend - opt_reply;
      opt_reply = (unsigned char *) realloc (opt_reply, len);
@@ -1803,9 +1803,9 @@ opt_welldefined (char *ep)
 }

 void
-env_opt_end (register int emptyok)
+env_opt_end (int emptyok)
 {
-  register int len;
+  int len;

  if (opt_replyp + 2 > opt_replyend)
    return;
@@ -1835,9 +1835,9 @@ env_opt_end (register int emptyok)
 int
 telrcv (void)
 {
-  register int c;
-  register int scc;
-  register unsigned char *sbp;
+  int c;
+  int scc;
+  unsigned char *sbp;
  int count;
  int returnValue = 0;

@@ -2181,8 +2181,8 @@ telsnd (void)
  count = 0;
  while (NETROOM () > 2)
    {
-      register int sc;
-      register int c;
+      int sc;
+      int c;

      if (tcc == 0)
 	{
@@ -2594,7 +2594,7 @@ nextitem (char *current)
      return current + 3;
    case SB:			/* loop forever looking for the SE */
      {
-	register char *look = current + 2;
+	char *look = current + 2;

 	for (;;)
 	  {
@@ -2634,7 +2634,7 @@ static void
 netclear (void)
 {
 #if 0				/* XXX */
-  register char *thisitem, *next;
+  char *thisitem, *next;
  char *good;
 # define wewant(p)	((nfrontp > p) && ((*p&0xff) == IAC) && \
 				((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
@@ -2736,7 +2736,7 @@ int
 get_status (const char *s)
 {
  unsigned char tmp[16];
-  register unsigned char *cp;
+  unsigned char *cp;

  if (my_want_state_is_dont (TELOPT_STATUS))
    {
@@ -2847,7 +2847,7 @@ sendnaws (void)
 {
  long rows, cols;
  unsigned char tmp[16];
-  register unsigned char *cp;
+  unsigned char *cp;

  if (my_state_is_wont (TELOPT_NAWS))
    return;
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -135,7 +135,7 @@ init_terminal (void)
 int
 ttyflush (int drop)
 {
-  register int n, n0, n1;
+  int n, n0, n1;

  n0 = ring_full_count (&ttyoring);
  if ((n1 = n = ring_full_consecutive (&ttyoring)) > 0)
@@ -238,7 +238,7 @@ setconnmode (int force)
 #ifdef	ENCRYPTION
  static int enc_passwd = 0;
 #endif /* ENCRYPTION */
-  register int newmode;
+  int newmode;

  newmode = getconnmode () | (force ? MODE_FORCE : 0);

--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -117,13 +117,13 @@ init_3270 (void)
 * only client needs for us to do that.
 */

-/*register char *buffer; where the data is */
-/* register int  count;	 how much to send */
+/*char *buffer; where the data is */
+/* int  count;	 how much to send */
 /* int		  done;	 is this the last of a logical block */
 int
-DataToNetwork (register char *buffer, register int count, int done)
+DataToNetwork (char *buffer, int count, int done)
 {
-  register int loop, c;
+  int loop, c;
  int origCount;

  origCount = count;
@@ -210,12 +210,12 @@ outputPurge ()
 * *all* the data at one time (thus the select).
 */

-/* register char *buffer;where the data is */
-/* register int	count;	 how much to send */
+/* char *buffer;where the data is */
+/* int	count;	 how much to send */
 int
-DataToTerminal (register char *buffer, register int count)
+DataToTerminal (char *buffer, int count)
 {
-  register int c;
+  int c;
  int origCount;

  origCount = count;
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -81,9 +81,9 @@ int prettydump;
 */

 void
-upcase (register char *argument)
+upcase (char *argument)
 {
-  register int c;
+  int c;

  while ((c = *argument) != 0)
    {
@@ -215,7 +215,7 @@ printoption (char *direction, int cmd, int option)
    }
  else
    {
-      register char *fmt;
+      char *fmt;
      fmt = (cmd == WILL)
 	? "WILL" : (cmd == WONT)
 	? "WONT" : (cmd == DO) ? "DO" : (cmd == DONT) ? "DONT" : 0;
@@ -247,7 +247,7 @@ printoption (char *direction, int cmd, int option)
 void
 optionstatus (void)
 {
-  register int i;
+  int i;
  extern char will_wont_resp[], do_dont_resp[];

  for (i = 0; i < 256; i++)
@@ -340,7 +340,7 @@ optionstatus (void)
 void
 printsub (char direction, unsigned char *pointer, int length)
 {
-  register int i;
+  int i;
  extern int want_status_response;

 #if defined AUTHENTICATION || defined ENCRYPTION
@@ -356,7 +356,7 @@ printsub (char direction, unsigned char *pointer, int length)
 		   (direction == '<') ? "RCVD" : "SENT");
 	  if (length >= 3)
 	    {
-	      register int j;
+	      int j;

 	      i = pointer[length - 2];
 	      j = pointer[length - 1];
@@ -752,8 +752,8 @@ printsub (char direction, unsigned char *pointer, int length)

 	case TELOPT_STATUS:
 	  {
-	    register char *cp;
-	    register int j, k;
+	    char *cp;
+	    int j, k;

 	    fprintf (NetTrace, "STATUS");

--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -94,7 +94,7 @@ startslave (char *host, int autologin, char *autoname)
 static void
 scrub_env (void)
 {
-  register char **cpp, **cpp2;
+  char **cpp, **cpp2;

  for (cpp2 = cpp = environ; *cpp; cpp++)
    {
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -66,7 +66,7 @@ static unsigned char slcbuf[NSLC * 6];	/* buffer for slc negotiation */
 void
 send_slc (void)
 {
-  register int i;
+  int i;

  /*
   * Send out list of triplets of special characters
@@ -114,7 +114,7 @@ send_slc (void)
 void
 default_slc (void)
 {
-  register int i;
+  int i;

  for (i = 1; i <= NSLC; i++)
    {
@@ -140,7 +140,7 @@ default_slc (void)
 void
 get_slc_defaults (void)
 {
-  register int i;
+  int i;

  init_termbuf ();

@@ -160,7 +160,7 @@ get_slc_defaults (void)
 * Add an slc triplet to the slc buffer.
 */
 void
-add_slc (register char func, register char flag, register cc_t val)
+add_slc (char func, char flag, cc_t val)
 {

  if ((*slcptr++ = (unsigned char) func) == 0xff)
@@ -183,7 +183,7 @@ add_slc (register char func, register char flag, register cc_t val)
 * of the terminal control structures.
 */
 void
-start_slc (register int getit)
+start_slc (int getit)
 {

  slcchange = 0;
@@ -200,9 +200,9 @@ start_slc (register int getit)
 * Finish up the slc negotiation.  If something to send, then send it.
 */
 int
-end_slc (register unsigned char **bufp)
+end_slc (unsigned char **bufp)
 {
-  register int len;
+  int len;
  void netflush (void);

  /*
@@ -252,10 +252,9 @@ end_slc (register unsigned char **bufp)
 * Figure out what to do about the client's slc
 */
 void
-process_slc (register unsigned char func, register unsigned char flag,
-	     register cc_t val)
+process_slc (unsigned char func, unsigned char flag, cc_t val)
 {
-  register int hislevel, mylevel, ack;
+  int hislevel, mylevel, ack;

  /*
   * Ensure that we know something about this function
@@ -327,10 +326,10 @@ process_slc (register unsigned char func, register unsigned char flag,
 * Compare client's request with what we are capable of supporting.
 */
 void
-change_slc (register char func_c, register char flag, register cc_t val)
+change_slc (char func_c, char flag, cc_t val)
 {
-  register int func = func_c;
-  register int hislevel, mylevel;
+  int func = func_c;
+  int hislevel, mylevel;

  hislevel = flag & SLC_LEVELBITS;
  mylevel = slctab[func].defset.flag & SLC_LEVELBITS;
@@ -445,7 +444,7 @@ change_slc (register char func_c, register char flag, register cc_t val)
 void
 check_slc (void)
 {
-  register int i;
+  int i;

  for (i = 1; i <= NSLC; i++)
    {
@@ -474,11 +473,11 @@ check_slc (void)
 * ptr points to the beginning of the buffer, len is the length.
 */
 void
-do_opt_slc (register unsigned char *ptr, register int len)
+do_opt_slc (unsigned char *ptr, int len)
 {
-  register unsigned char func, flag;
+  unsigned char func, flag;
  cc_t val;
-  register unsigned char *end = ptr + len;
+  unsigned char *end = ptr + len;

  if (terminit ())
    {				/* go ahead */
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -191,7 +191,7 @@ send_intr (void)
 void
 telrcv (void)
 {
-  register int c;
+  int c;
  static int state = TS_DATA;

  while ((net_input_level () > 0) & !pty_buffer_is_full ())
@@ -1150,7 +1150,7 @@ int env_ovalue = -1;
 void
 suboption (void)
 {
-  register int subchar;
+  int subchar;

  DEBUG (debug_options, 1, printsub ('<', subpointer, SB_LEN () + 2));

@@ -1159,7 +1159,7 @@ suboption (void)
    {
    case TELOPT_TSPEED:
      {
-	register int xspeed, rspeed;
+	int xspeed, rspeed;

 	if (his_state_is_wont (TELOPT_TSPEED))	/* Ignore if option disabled */
 	  break;
@@ -1212,7 +1212,7 @@ suboption (void)

    case TELOPT_NAWS:
      {
-	register int xwinsize, ywinsize;
+	int xwinsize, ywinsize;

 	if (his_state_is_wont (TELOPT_NAWS))	/* Ignore if option disabled */
 	  break;
@@ -1237,7 +1237,7 @@ suboption (void)

    case TELOPT_LINEMODE:
      {
-	register int request;
+	int request;

 	/* Ignore if option disabled */
 	if (his_state_is_wont (TELOPT_LINEMODE))
@@ -1324,8 +1324,8 @@ suboption (void)
    case TELOPT_NEW_ENVIRON:
    case TELOPT_OLD_ENVIRON:
      {
-	register int c;
-	register char *cp, *varp, *valp;
+	int c;
+	char *cp, *varp, *valp;

 	if (SB_EOF ())
 	  return;
@@ -1359,7 +1359,7 @@ suboption (void)
 	     */
 	    if (env_ovar < 0)
 	      {
-		register int last = -1;	/* invalid value */
+		int last = -1;	/* invalid value */
 		int empty = 0;
 		int got_var = 0, got_value = 0, got_uservar = 0;

@@ -1616,8 +1616,8 @@ send_status (void)

  unsigned char statusbuf[256];
  unsigned char *ep;
-  register unsigned char *ncp;
-  register unsigned char i;
+  unsigned char *ncp;
+  unsigned char i;

  ncp = statusbuf;
  ep = statusbuf + sizeof (statusbuf);
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -618,7 +618,7 @@ telnetd_run (void)
  for (;;)
    {
      fd_set ibits, obits, xbits;
-      register int c;
+      int c;

      if (net_input_level () < 0 && pty_input_level () < 0)
 	break;
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -422,7 +422,7 @@ flowstat (void)
 * affected.
 */
 void
-clientstat (register int code, register int parm1, register int parm2)
+clientstat (int code, int parm1, int parm2)
 {
  void netflush (void);

@@ -505,7 +505,7 @@ clientstat (register int code, register int parm1, register int parm2)

    case LM_MODE:
      {
-	register int ack, changed;
+	int ack, changed;

 	/*
 	 * Client has sent along a mode mask.  If it agrees with