tip(1): Remove "register".

diff --git a/usr.bin/tip/libacu/acucommon.c b/usr.bin/tip/libacu/acucommon.c
index e5c3441..83bdf2b 100644 (file)
--- a/usr.bin/tip/libacu/acucommon.c
+++ b/usr.bin/tip/libacu/acucommon.c
@@ -32,7 +32,6 @@
  *
  * @(#)acucommon.c     8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/libacu/acucommon.c,v 1.3 1999/08/28 01:06:30 peter Exp $
- * $DragonFly: src/usr.bin/tip/libacu/acucommon.c,v 1.2 2003/06/17 04:29:32 dillon Exp $
  */
 
 /*
@@ -83,7 +82,7 @@ void acu_nap (unsigned int how_long)
 {
                                int omask;
         struct itimerval itv, oitv;
-        register struct itimerval *itp = &itv;
+        struct itimerval *itp = &itv;
         struct sigvec vec, ovec;
 
         timerclear(&itp->it_interval);

diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 428f984..2c716cc 100644 (file)
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * @(#)biz22.c 8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/tip/libacu/biz22.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  */
 
 #include "tipconf.h"
@@ -54,7 +53,7 @@ static int
 biz_dialer(num, mod)
        char *num, *mod;
 {
-       register int connected = 0;
+       int connected = 0;
        char cbuf[40];
 
        if (boolean(value(VERBOSE)))
@@ -142,7 +141,7 @@ sigALRM()
 
 static int
 cmd(s)
-       register char *s;
+       char *s;
 {
        sig_t f;
        char c;
@@ -164,7 +163,7 @@ cmd(s)
 
 static int
 detect(s)
-       register char *s;
+       char *s;
 {
        sig_t f;
        char c;

diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index 89c79a5..f5aac42 100644 (file)
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -52,7 +52,7 @@ static int
 biz_dialer(num, mod)
        char *num, *mod;
 {
-       register int connected = 0;
+       int connected = 0;
 
        if (!bizsync(FD)) {
                logent(value(HOST), "", "biz", "out of sync");
@@ -128,7 +128,7 @@ biz31_abort()
 
 static int
 echo(s)
-       register char *s;
+       char *s;
 {
        char c;
 
@@ -160,7 +160,7 @@ sigALRM()
 
 static int
 detect(s)
-       register char *s;
+       char *s;
 {
        sig_t f;
        char c;
@@ -185,7 +185,7 @@ detect(s)
 
 static int
 flush(s)
-       register char *s;
+       char *s;
 {
        sig_t f;
        char c;
@@ -220,7 +220,7 @@ bizsync(fd)
 #      define chars(b) (b)
 #      define IOCTL    FIONREAD
 #endif
-       register int already = 0;
+       int already = 0;
        char buf[10];
 
 retry:

diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index 3620964..9bbd49c 100644 (file)
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * @(#)courier.c       8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/tip/libacu/courier.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  */
 
 /*
@@ -54,10 +53,10 @@ static      jmp_buf timeoutbuf, intbuf;
 static int coursync();
 
 cour_dialer(num, acu)
-       register char *num;
+       char *num;
        char *acu;
 {
-       register char *cp;
+       char *cp;
 #if ACULOG
        char line[80];
 #endif
@@ -134,7 +133,7 @@ sigALRM()
 
 static int
 cour_swallow(match)
-  register char *match;
+  char *match;
   {
        sig_t f;
        char c;

diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index 2dd4945..de2d433 100644 (file)
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -61,7 +61,7 @@ df_dialer(num, acu, df03)
        char *num, *acu;
        int df03;
 {
-       register int f = FD;
+       int f = FD;
        int speed = 0, rw = 2;
        char c = '\0';
 

diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index 34fcb90..cb85e84 100644 (file)
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/tip/libacu/dn11.c,v 1.1.12.1 2000/07/01 12:24:22 ps Exp $
- * $DragonFly: src/usr.bin/tip/libacu/dn11.c,v 1.2 2003/06/17 04:29:32 dillon Exp $
  *
  * @(#)dn11.c  8.1 (Berkeley) 6/6/93
  */
@@ -53,7 +52,7 @@ dn_dialer(num, acu)
 {
        char *p, *q, phone[40];
        int lt, nw, connected = 1;
-       register int timelim;
+       int timelim;
 
        if (boolean(value(VERBOSE)))
                printf("\nstarting call...");

diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index f5afc58..365732b 100644 (file)
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -75,11 +75,11 @@ static char dumbuf[DUMBUFLEN];
 static int state = IDLE;
 
 hay_dialer(num, acu)
-       register char *num;
+       char *num;
        char *acu;
 {
-       register char *cp;
-       register int connected = 0;
+       char *cp;
+       int connected = 0;
        char dummy;
 #if ACULOG
        char line[80];
@@ -160,7 +160,7 @@ sigALRM()
 
 static char
 gobble(match)
-       register char *match;
+       char *match;
 {
        char c;
        sig_t f;
@@ -195,7 +195,7 @@ gobble(match)
 }
 
 error_rep(c)
-       register char c;
+       char c;
 {
        printf("\n\r");
        switch (c) {

diff --git a/usr.bin/tip/libacu/multitech.c b/usr.bin/tip/libacu/multitech.c
index 385bfdd..fe77c1e 100644 (file)
--- a/usr.bin/tip/libacu/multitech.c
+++ b/usr.bin/tip/libacu/multitech.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * @(#)multitech.c     8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/tip/libacu/multitech.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  */
 
 /*
@@ -70,7 +69,7 @@ void multitech_disconnect ();
 void acu_nap (unsigned int how_long);
 static void sigALRM ();
 static int multitechsync ();
-static int multitech_swallow (register char *match);
+static int multitech_swallow (char *match);
 static int multitech_connect(void);
 
 /*
@@ -80,9 +79,9 @@ static int timeout = 0;
 static int connected = 0;
 static jmp_buf timeoutbuf, intbuf;
 
-int multitech_dialer (register char *num, char *acu)
+int multitech_dialer (char *num, char *acu)
 {
-       register char *cp;
+       char *cp;
 #if ACULOG
        char line [80];
 #endif
@@ -200,7 +199,7 @@ static void sigALRM ()
        longjmp(timeoutbuf, 1);
 }
 
-static int multitech_swallow (register char *match)
+static int multitech_swallow (char *match)
   {
        sig_t f;
        char c;

diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index c9627b2..9c0a6e9 100644 (file)
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * @(#)t3000.c 8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/tip/libacu/t3000.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  */
 
 /*
@@ -54,10 +53,10 @@ static      int t3000_connect(void);
 static int t3000_swallow(char *);
 
 t3000_dialer(num, acu)
-       register char *num;
+       char *num;
        char *acu;
 {
-       register char *cp;
+       char *cp;
 #if ACULOG
        char line[80];
 #endif
@@ -133,7 +132,7 @@ sigALRM()
 
 static int
 t3000_swallow(match)
-  register char *match;
+  char *match;
   {
        sig_t f;
        char c;

diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index 68a7061..b57f147 100644 (file)
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -32,7 +32,6 @@
  *
  * @(#)unidialer.c     8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/libacu/unidialer.c,v 1.7 1999/08/28 01:06:30 peter Exp $
- * $DragonFly: src/usr.bin/tip/libacu/unidialer.c,v 1.4 2005/05/07 23:20:43 corecode Exp $
  */
 
 /*
@@ -91,7 +90,7 @@ static unsigned int intercommand_delay;
 static unsigned int escape_guard_time;
 static unsigned int reset_delay;
 
-static int unidialer_dialer (register char *num, char *acu);
+static int unidialer_dialer (char *num, char *acu);
 static void unidialer_disconnect ();
 static void unidialer_abort ();
 static int unidialer_connect(void);
@@ -134,7 +133,7 @@ static void unidialer_write_str (int fd, CONST char *cp);
 static void unidialer_disconnect ();
 static void sigALRM ();
 static int unidialersync ();
-static int unidialer_swallow (register char *match);
+static int unidialer_swallow (char *match);
 
 /*
        Global vars
@@ -404,9 +403,9 @@ int unidialer_get_okay (int ms)
        return okay;
 }
 
-static int unidialer_dialer (register char *num, char *acu)
+static int unidialer_dialer (char *num, char *acu)
 {
-       register char *cp;
+       char *cp;
        char dial_string [80];
 #if ACULOG
        char line [80];
@@ -561,7 +560,7 @@ static void sigALRM ()
        longjmp(timeoutbuf, 1);
 }
 
-static int unidialer_swallow (register char *match)
+static int unidialer_swallow (char *match)
 {
        sig_t f;
        char c;

diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 2983034..3a1a6b1 100644 (file)
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * @(#)v3451.c 8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/tip/libacu/v3451.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  */
 
 /*
@@ -49,7 +48,7 @@ static int prefix(char *, char *);
 static jmp_buf Sjbuf;
 
 v3451_dialer(num, acu)
-       register char *num;
+       char *num;
        char *acu;
 {
        sig_t func;
@@ -138,7 +137,7 @@ v3451_abort()
 
 static void
 vawrite(cp, delay)
-       register char *cp;
+       char *cp;
        int delay;
 {
 
@@ -148,10 +147,10 @@ vawrite(cp, delay)
 
 static
 expect(cp)
-       register char *cp;
+       char *cp;
 {
        char buf[300];
-       register char *rp = buf;
+       char *rp = buf;
        int timeout = 30, online = 0;
 
        if (strcmp(cp, "\"\"") == 0)
@@ -203,9 +202,9 @@ notin(sh, lg)
 
 static
 prefix(s1, s2)
-       register char *s1, *s2;
+       char *s1, *s2;
 {
-       register char c;
+       char c;
 
        while ((c = *s1++) == *s2++)
                if (c == '\0')

diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 1d99046..4f1aa30 100644 (file)
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/tip/libacu/v831.c,v 1.1.12.1 2000/07/01 12:24:22 ps Exp $
- * $DragonFly: src/usr.bin/tip/libacu/v831.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  *
  * @(#)v831.c  8.1 (Berkeley) 6/6/93
  */
@@ -55,7 +54,7 @@ v831_dialer(num, acu)
         char *num, *acu;
 {
         int status, pid, connected = 1;
-        register int timelim;
+        int timelim;
 
         if (boolean(value(VERBOSE)))
                 printf("\nstarting call...");
@@ -180,10 +179,10 @@ struct vaconfig {
 
 static int
 dialit(phonenum, acu)
-       register char *phonenum;
+       char *phonenum;
        char *acu;
 {
-        register struct vaconfig *vp;
+        struct vaconfig *vp;
         char c;
         int i, two = 2;
 
@@ -256,10 +255,10 @@ dialit(phonenum, acu)
 
 static char *
 sanitize(s)
-       register char *s;
+       char *s;
 {
         static char buf[128];
-        register char *cp;
+        char *cp;
 
         for (cp = buf; *s; s++) {
                if (!isdigit(*s) && *s == '<' && *s != '_')

diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index c52302c..77eee3a 100644 (file)
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -32,7 +32,6 @@
  *
  * @(#)ventel.c        8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/libacu/ventel.c,v 1.3 1999/08/28 01:06:31 peter Exp $
- * $DragonFly: src/usr.bin/tip/libacu/ventel.c,v 1.3 2005/05/07 23:20:43 corecode Exp $
  */
 
 /*
@@ -59,15 +58,15 @@ static      jmp_buf timeoutbuf;
  */
 #define delay(num,denom) busyloop(CPUSPEED*num/denom)
 #define CPUSPEED 1000000       /* VAX 780 is 1MIPS */
-#define        DELAY(n)        { register long N = (n); while (--N > 0); }
+#define        DELAY(n)        { long N = (n); while (--N > 0); }
 busyloop(n) { DELAY(n); }
 
 ven_dialer(num, acu)
-       register char *num;
+       char *num;
        char *acu;
 {
-       register char *cp;
-       register int connected = 0;
+       char *cp;
+       int connected = 0;
        char *msg, *index(), line[80];
 
        /*
@@ -142,7 +141,7 @@ ven_abort()
 
 static void
 echo(s)
-       register char *s;
+       char *s;
 {
        char c;
 
@@ -174,10 +173,10 @@ sigALRM()
 
 static int
 gobble(match, response)
-       register char match;
+       char match;
        char response[];
 {
-       register char *cp = response;
+       char *cp = response;
        sig_t f;
        char c;
 

diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 287389b..f967886 100644 (file)
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -32,7 +32,6 @@
  *
  * @(#)acu.c   8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/acu.c,v 1.5 1999/08/28 01:06:31 peter Exp $
- * $DragonFly: src/usr.bin/tip/tip/acu.c,v 1.3 2005/04/19 05:32:02 cpressey Exp $
  */
 
 #include "tipconf.h"
@@ -66,7 +65,7 @@ static jmp_buf jmpbuf;
 char *
 connect()
 {
-       register char *cp = PN;
+       char *cp = PN;
        char *phnum, string[256];
        FILE *fd;
        int tried = 0;
@@ -190,9 +189,9 @@ acuabort(s)
 
 static acu_t *
 acutype(s)
-       register char *s;
+       char *s;
 {
-       register acu_t *p;
+       acu_t *p;
        extern acu_t acutable[];
 
        for (p = acutable; p->acu_name != '\0'; p++)

diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 9d12fbf..af3e334 100644 (file)
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -32,7 +32,6 @@
  *
  * @(#)cmds.c  8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.11.2.2 2000/07/01 12:24:23 ps Exp $
- * $DragonFly: src/usr.bin/tip/tip/cmds.c,v 1.5 2005/04/19 05:32:02 cpressey Exp $
  */
 
 #include "tipconf.h"
@@ -238,7 +237,7 @@ xfer(char *buf, int fd, char *eofchars)
                if (c == '\r')
                        continue;
                if (c != *match && match > eofchars) {
-                       register char *p = eofchars;
+                       char *p = eofchars;
                        while (p < match) {
                                if (*p == '\n'&& v)
                                        (void)printf("\r%d", ++ct);
@@ -270,9 +269,9 @@ xfer(char *buf, int fd, char *eofchars)
 static void
 transfer(char *buf, int fd, char *eofchars)
 {
-       register int ct;
+       int ct;
        char c;
-       register int cnt, eof, v;
+       int cnt, eof, v;
        time_t start;
        sig_t f;
        char r;
@@ -366,7 +365,7 @@ pipefile(void)
                                ;
                }
        } else {
-               register int f;
+               int f;
 
                dup2(pdes[0], 0);
                close(pdes[0]);
@@ -633,7 +632,7 @@ pipeout(int c)
                while ((p = wait(&status)) > 0 && p != cpid)
                        ;
        } else {
-               register int i;
+               int i;
 
                dup2(FD, 1);
                for (i = 3; i < 20; i++)
@@ -679,7 +678,7 @@ tiplink (char *cmd, unsigned int flags)
                while ((p = wait(&status)) > 0 && p != cpid)
                        ;
        } else {
-               register int fd;
+               int fd;
 
                dup2(FD, 0);
                dup2(3, 1);
@@ -788,7 +787,7 @@ void
 chdirectory(void)
 {
        char dirname[PATH_MAX];
-       register char *cp = dirname;
+       char *cp = dirname;
 
        if (prompt("[cd] ", dirname, sizeof(dirname))) {
                if (stoprompt)
@@ -842,7 +841,7 @@ intcopy(void)
 static void
 execute(char *s)
 {
-       register char *cp;
+       char *cp;
 
        if ((cp = rindex(value(SHELL), '/')) == NULL)
                cp = value(SHELL);
@@ -855,9 +854,9 @@ execute(char *s)
 static int
 args(char *buf, char **a, int num)
 {
-       register char *p = buf, *start;
-       register char **parg = a;
-       register int n = 0;
+       char *p = buf, *start;
+       char **parg = a;
+       int n = 0;
 
        while (*p && n < num) {
                while (*p && (*p == ' ' || *p == '\t'))
@@ -878,7 +877,7 @@ args(char *buf, char **a, int num)
 static void
 prtime(char *s, time_t a)
 {
-       register i;
+       int i;
        int nums[3];
 
        for (i = 0; i < 3; i++) {
@@ -1005,8 +1004,8 @@ expand(char *name)
 {
        static char xname[BUFSIZ];
        char cmdbuf[BUFSIZ];
-       register int pid, l;
-       register char *cp, *Shell;
+       int pid, l;
+       char *cp, *Shell;
        int s, pivec[2] /*, (*sigint)()*/;
 
        if (!anyof(name, "~{[*?$`'\"\\"))
@@ -1071,9 +1070,9 @@ expand(char *name)
  */
 
 static int
-anyof(register char *s1, register char *s2)
+anyof(char *s1, char *s2)
 {
-       register int c;
+       int c;
 
        while ((c = *s1++))
                if (any(c, s2))

diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 492303b..194d09a 100644 (file)
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -32,7 +32,6 @@
  *
  * @(#)cu.c    8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.4 1999/08/28 01:06:33 peter Exp $
- * $DragonFly: src/usr.bin/tip/tip/cu.c,v 1.3 2005/04/19 05:32:02 cpressey Exp $
  */
 
 #include "tipconf.h"
@@ -48,7 +47,7 @@ void  cleanup();
 cumain(argc, argv)
        char *argv[];
 {
-       register int i;
+       int i;
        static char sbuf[12];
 
        if (argc < 2) {

diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index cdada18..5da56c5 100644 (file)
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -32,7 +32,6 @@
  *
  * @(#)hunt.c  8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/hunt.c,v 1.5 1999/08/28 01:06:33 peter Exp $
- * $DragonFly: src/usr.bin/tip/tip/hunt.c,v 1.3 2004/10/26 22:10:13 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -58,7 +57,7 @@ long
 hunt(name)
        char *name;
 {
-       register char *cp;
+       char *cp;
        sig_t f;
        int res;
 

diff --git a/usr.bin/tip/tip/remcap.c b/usr.bin/tip/tip/remcap.c
index aa4721f..753c797 100644 (file)
--- a/usr.bin/tip/tip/remcap.c
+++ b/usr.bin/tip/tip/remcap.c
@@ -123,8 +123,8 @@ tgetent(bp, name)
 getent(bp, name, cp)
        char *bp, *name, *cp;
 {
-       register int c;
-       register int i = 0, cnt = 0;
+       int c;
+       int i = 0, cnt = 0;
        char ibuf[BUFSIZ], *cp2;
        int tf;
 
@@ -198,7 +198,7 @@ getent(bp, name, cp)
  */
 tnchktc()
 {
-       register char *p, *q;
+       char *p, *q;
        char tcname[16];        /* name of similar terminal */
        char tcbuf[BUFSIZ];
        char *holdtbuf = tbuf;
@@ -251,7 +251,7 @@ tnchktc()
 tnamatch(np)
        char *np;
 {
-       register char *Np, *Bp;
+       char *Np, *Bp;
 
        Bp = tbuf;
        if (*Bp == '#')
@@ -276,7 +276,7 @@ tnamatch(np)
  */
 static char *
 tskip(bp)
-       register char *bp;
+       char *bp;
 {
 
        while (*bp && *bp != ':')
@@ -297,8 +297,8 @@ tskip(bp)
 tgetnum(id)
        char *id;
 {
-       register int i, base;
-       register char *bp = tbuf;
+       int i, base;
+       char *bp = tbuf;
 
        for (;;) {
                bp = tskip(bp);
@@ -330,7 +330,7 @@ tgetnum(id)
 tgetflag(id)
        char *id;
 {
-       register char *bp = tbuf;
+       char *bp = tbuf;
 
        for (;;) {
                bp = tskip(bp);
@@ -357,7 +357,7 @@ char *
 tgetstr(id, area)
        char *id, **area;
 {
-       register char *bp = tbuf;
+       char *bp = tbuf;
 
        for (;;) {
                bp = tskip(bp);
@@ -380,12 +380,12 @@ tgetstr(id, area)
  */
 static char *
 tdecode(str, area)
-       register char *str;
+       char *str;
        char **area;
 {
-       register char *cp;
-       register int c;
-       register char *dp;
+       char *cp;
+       int c;
+       char *dp;
        int i;
 
        cp = *area;

diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 1e243d7..da90763 100644 (file)
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -34,7 +34,6 @@
  * @(#) Copyright (c) 1992, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)remote.c        8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/remote.c,v 1.4 1999/08/28 01:06:35 peter Exp $
- * $DragonFly: src/usr.bin/tip/tip/remote.c,v 1.4 2005/04/19 05:32:02 cpressey Exp $
  */
 
 #include <err.h>
@@ -101,9 +100,9 @@ expand_tilde (char **path, void (*free) (char *p))
 
 static void
 getremcap(host)
-       register char *host;
+       char *host;
 {
-       register char **p, ***q;
+       char **p, ***q;
        char *bp;
        char *rempath;
        int   stat;
@@ -251,7 +250,7 @@ char *
 getremote(host)
        char *host;
 {
-       register char *cp;
+       char *cp;
        static char *next;
        static int lookedup = 0;
 

diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 5b67915..277a4ab 100644 (file)
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -33,7 +33,6 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)tip.c   8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.12.2.2 2001/06/02 08:08:24 phk Exp $
- * $DragonFly: src/usr.bin/tip/tip/tip.c,v 1.6 2005/04/19 05:32:02 cpressey Exp $
  */
 
 /*
@@ -95,8 +94,8 @@ main(argc, argv)
        char *argv[];
 {
        char *system = NULL;
-       register int i;
-       register char *p;
+       int i;
+       char *p;
        char sbuf[12];
 
        gid = getgid();
@@ -384,10 +383,10 @@ static    jmp_buf promptbuf;
 int
 prompt(s, p, sz)
        char *s;
-       register char *p;
+       char *p;
        size_t sz;
 {
-       register char *b = p;
+       char *b = p;
        sig_t oint, oquit;
 
        stoprompt = 0;
@@ -483,8 +482,8 @@ extern esctable_t etable[];
 char
 escape()
 {
-       register char gch;
-       register esctable_t *p;
+       char gch;
+       esctable_t *p;
        char c = character(value(ESCAPE));
        int i;
 
@@ -513,7 +512,7 @@ speed(n)
 #if HAVE_TERMIOS
        return (n);
 #else
-       register CONST int *p;
+       CONST int *p;
 
        for (p = bauds; *p != -1;  p++)
                if (*p == n)
@@ -524,7 +523,7 @@ speed(n)
 
 int
 any(c, p)
-       register char c, *p;
+       char c, *p;
 {
        while (p && *p)
                if (*p++ == c)
@@ -534,9 +533,9 @@ any(c, p)
 
 int
 size(s)
-       register char   *s;
+       char    *s;
 {
-       register int i = 0;
+       int i = 0;
 
        while (s && *s++)
                i++;
@@ -545,10 +544,10 @@ size(s)
 
 char *
 interp(s)
-       register char *s;
+       char *s;
 {
        static char buf[256];
-       register char *p = buf, c, *q;
+       char *p = buf, c, *q;
 
        while ((c = *s++)) {
                for (q = "\nn\rr\tt\ff\033E\bb"; *q; q++)
@@ -593,7 +592,7 @@ void
 help(c)
        char c;
 {
-       register esctable_t *p;
+       esctable_t *p;
 
        printf("%c\r\n", c);
        for (p = etable; p->e_char; p++) {
@@ -644,9 +643,9 @@ ttysetup (int speed)
  */
 char *
 sname(s)
-       register char *s;
+       char *s;
 {
-       register char *p = s;
+       char *p = s;
 
        while (*s)
                if (*s++ == '/')
@@ -666,10 +665,10 @@ void
 xpwrite(fd, buf, n)
        int fd;
        char *buf;
-       register int n;
+       int n;
 {
-       register int i;
-       register char *bp;
+       int i;
+       char *bp;
 
        bp = buf;
        if (bits8 == 0)
@@ -693,7 +692,7 @@ void
 setparity(defparity)
        char *defparity;
 {
-       register int i, flip, clr, set;
+       int i, flip, clr, set;
        char *parity;
        extern char evenpartab[];
 

diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 52374c6..d925cbb 100644 (file)
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -32,7 +32,6 @@
  *
  * @(#)tipout.c        8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/tipout.c,v 1.6.2.2 2001/06/02 08:08:24 phk Exp $
- * $DragonFly: src/usr.bin/tip/tip/tipout.c,v 1.2 2003/06/17 04:29:33 dillon Exp $
  */
 
 #include "tip.h"
@@ -67,7 +66,7 @@ void
 intEMT()
 {
        char c, line[256];
-       register char *pline = line;
+       char *pline = line;
        char reply;
 
        read(fildes[0], &c, 1);
@@ -117,8 +116,8 @@ void
 tipout()
 {
        char buf[BUFSIZ];
-       register char *cp;
-       register int cnt;
+       char *cp;
+       int cnt;
        int omask;
 
        signal(SIGINT, SIG_IGN);

diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index b807363..8d9c355 100644 (file)
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -32,7 +32,6 @@
  *
  * @(#)value.c 8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/value.c,v 1.5.2.1 2000/07/01 12:24:23 ps Exp $
- * $DragonFly: src/usr.bin/tip/tip/value.c,v 1.5 2005/05/07 23:20:43 corecode Exp $
  */
 
 #include "tip.h"
@@ -52,8 +51,8 @@ static int col = 0;
 void
 vinit()
 {
-       register value_t *p;
-       register char *cp;
+       value_t *p;
+       char *cp;
        FILE *f;
        char file[256];
 
@@ -74,7 +73,7 @@ vinit()
        strcpy(file, value(HOME));
        strcat(file, "/.tiprc");
        if ((f = fopen(file, "r")) != NULL) {
-               register char *tp;
+               char *tp;
 
                while (fgets(file, sizeof(file)-1, f) != NULL) {
                        if (vflag)
@@ -96,7 +95,7 @@ static int vaccess();
 /*VARARGS1*/
 void
 vassign(p, v)
-       register value_t *p;
+       value_t *p;
        char *v;
 {
 
@@ -144,16 +143,16 @@ static void vtoken(char *);
 
 void
 vlex(s)
-       register char *s;
+       char *s;
 {
-       register value_t *p;
+       value_t *p;
 
        if (equal(s, "all")) {
                for (p = vtable; p->v_name; p++)
                        if (vaccess(p->v_access, READ))
                                vprint(p);
        } else {
-               register char *cp;
+               char *cp;
 
                do {
                        if ((cp = vinterp(s, ' ')))
@@ -170,10 +169,10 @@ vlex(s)
 
 static void
 vtoken(s)
-       register char *s;
+       char *s;
 {
-       register value_t *p;
-       register char *cp;
+       value_t *p;
+       char *cp;
        char *expand();
 
        if ((cp = index(s, '='))) {
@@ -210,9 +209,9 @@ vtoken(s)
 
 static void
 vprint(p)
-       register value_t *p;
+       value_t *p;
 {
-       register char *cp;
+       char *cp;
        extern char *interp(), *ctrl();
 
        if (col > 0 && col < MIDDLE)
@@ -264,7 +263,7 @@ vprint(p)
 
 static int
 vaccess(mode, rw)
-       register unsigned mode, rw;
+       unsigned mode, rw;
 {
        if (mode & (rw<<PUBLIC))
                return (1);
@@ -275,9 +274,9 @@ vaccess(mode, rw)
 
 static value_t *
 vlookup(s)
-       register char *s;
+       char *s;
 {
-       register value_t *p;
+       value_t *p;
 
        for (p = vtable; p->v_name; p++)
                if (equal(p->v_name, s) || (p->v_abrev && equal(p->v_abrev, s)))
@@ -287,10 +286,10 @@ vlookup(s)
 
 char *
 vinterp(s, stop)
-       register char *s;
+       char *s;
        char stop;
 {
-       register char *p = s, c;
+       char *p = s, c;
        int num;
 
        while ((c = *s++) && c != stop)
@@ -309,7 +308,7 @@ vinterp(s, stop)
                        if (c >= '0' && c <= '7')
                                num = (num<<3)+(c-'0');
                        else {
-                               register char *q = "n\nr\rt\tb\bf\f";
+                               char *q = "n\nr\rt\tb\bf\f";
 
                                for (; *q; q++)
                                        if (c == *q++) {
@@ -344,10 +343,10 @@ vinterp(s, stop)
 
 int
 vstring(s,v)
-       register char *s;
-       register char *v;
+       char *s;
+       char *v;
 {
-       register value_t *p;
+       value_t *p;
        char *expand();
 
        p = vlookup(s);