Remove use of C's register keyword.

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 70ddb8db0d3e3481f3fbee01fd3457efaadc10d0..bc93672a2557208cad9e6c000e2ae9981e915237 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -286,9 +286,9 @@ int
 ismymbox (struct mailname *np)
 {
     int oops;
-    register int len, i;
-    register char *cp;
-    register char *pp;
+    int len, i;
+    char *cp;
+    char *pp;
     char buffer[BUFSIZ];
     struct mailname *mp;
     static char *am = NULL;

diff --git a/sbr/atooi.c b/sbr/atooi.c
index d62de1708fe5943e843a169fb62e7f40d028fb90..6a4e533060c6e0ef707892db3e839156c2ce2840 100644 (file)
--- a/sbr/atooi.c
+++ b/sbr/atooi.c
@@ -13,7 +13,7 @@
 int
 atooi(char *cp)
 {
-    register int i, base;
+    int i, base;
 
     i = 0;
     base = 8;

diff --git a/sbr/client.c b/sbr/client.c
index 6695e084e59e802a8e09f6808032d446ce526ea4..b75f0e29f3a5614a378b0b3008ad4615e9eba12c 100644 (file)
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -136,8 +136,8 @@ static char *broken[MAXARGS + 1];
 static char **
 client_brkstring (char *strg, char *brksep, char *brkterm)
 {
-    register int bi;
-    register char c, *sp;
+    int bi;
+    char c, *sp;
 
     sp = strg;
 
@@ -166,7 +166,7 @@ client_brkstring (char *strg, char *brksep, char *brkterm)
 static int
 client_brkany (char chr, char *strg)
 {
-    register char *sp;
+    char *sp;
 
     if (strg)
        for (sp = strg; *sp; sp++)

diff --git a/sbr/context_del.c b/sbr/context_del.c
index e6cdc73dddd6a0090cf757a4f972754054660522..5889a17fa8fe1a2d1bbdc2e0f3707d64412103af 100644 (file)
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -17,7 +17,7 @@
 int
 context_del (char *key)
 {
-    register struct node *np, *pp;
+    struct node *np, *pp;
 
     for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) {
        if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index aabac5583291c101d5bb838500fd58bc9fdef6ee..e8407066d981420257bd1187150bfbddc4783fe2 100644 (file)
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -18,7 +18,7 @@
 int
 context_foil (char *path)
 {
-    register struct node *np;
+    struct node *np;
 
     /* In fact, nobody examines defpath in code paths where
      * it's been set by us -- the uses in the source tree are:

diff --git a/sbr/context_read.c b/sbr/context_read.c
index de14b0d560920aec7b7fb7231b394536b5d24d71..adaa172b5f132ad779c6781b81e5b88cbf298a7d 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -32,8 +32,8 @@ context_read (void)
     char                       *cp;            /* miscellaneous pointer */
     char                       *nd;            /* nmh directory pointer */
     struct     stat            st;             /* stat() results */
-    register   struct  passwd  *pw;            /* getpwuid() results */
-    register   FILE            *ib;            /* profile and context file pointer */
+    struct     passwd          *pw;            /* getpwuid() results */
+    FILE                       *ib;            /* profile and context file pointer */
     int failed_to_lock = 0;
 
     /*

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 0e9e11467d10d007a3ab13a078b5939f3e0d7370..907acb35a7e606c15b2ff7e988310d02a863d84a 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -14,7 +14,7 @@
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
+    struct node *np;
 
     /*
      * If list is empty, allocate head of profile/context list.

diff --git a/sbr/context_save.c b/sbr/context_save.c
index 27d55e9e775ff7e0b75da096c31974488015800f..62bc48e66ddd3b5a7b3b0293566adeb12d9fb84e 100644 (file)
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -19,7 +19,7 @@
 void
 context_save (void)
 {
-    register struct node *np;
+    struct node *np;
     FILE *out;
     sigset_t set, oset;
     int failed_to_lock = 0;

diff --git a/sbr/cpydgst.c b/sbr/cpydgst.c
index 12829f1312b83f405b87adfceaca6ce792bff8b7..55df3fc68d0ee3a14b4eb913e41e0e1daed908a1 100644 (file)
--- a/sbr/cpydgst.c
+++ b/sbr/cpydgst.c
@@ -35,9 +35,9 @@
 void
 cpydgst (int in, int out, char *ifile, char *ofile)
 {
-    register int i, j, state;
-    register char *cp, *ep;
-    register char *bp, *dp;
+    int i, j, state;
+    char *cp, *ep;
+    char *bp, *dp;
     char buffer[BUFSIZ], outbuf[BUFSIZ];
 
     dp = (bp = outbuf) + sizeof outbuf;

diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index 67de2a507feeb2b8fdef1df11d5f532603ffa6cf..ec025be55cdc59a9626eb32d951d7cae24ebf4b4 100644 (file)
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -29,7 +29,7 @@ struct crawl_context {
 static void
 add_folder (char *fold, struct crawl_context *crawl)
 {
-    register int i, j;
+    int i, j;
 
     /* if necessary, reallocate the space for folder names */
     if (crawl->foldp >= crawl->max) {

diff --git a/sbr/dtimep.l b/sbr/dtimep.l
index bae6ac5c64e6dc1ce2bdf609f165cf365f721211..f1beb5c354e7bef6d6fe4184656ff6ae1bfb4213 100644 (file)
--- a/sbr/dtimep.l
+++ b/sbr/dtimep.l
@@ -168,7 +168,7 @@ static int day_map[] = {
 static void
 zonehack (struct tws *tw)
 {
-    register struct tm *tm;
+    struct tm *tm;
 
     if (dmktime (tw) == (time_t) -1)
        return;

diff --git a/sbr/fdcompare.c b/sbr/fdcompare.c
index db4838f48b461f6a8edc1cedae1b7900761dd572..7f06ec7c15e2cb4536f75e37fed2162bbdd11822 100644 (file)
--- a/sbr/fdcompare.c
+++ b/sbr/fdcompare.c
@@ -13,8 +13,8 @@
 int
 fdcompare (int fd1, int fd2)
 {
-    register int i, n1, n2, resp;
-    register char *c1, *c2;
+    int i, n1, n2, resp;
+    char *c1, *c2;
     char b1[BUFSIZ], b2[BUFSIZ];
 
     resp = 1;

diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index 07c0cecfdf16213513409119d7d48ed9e5d6a458..b3db62888390c233590e64247762b7f26b10289c 100644 (file)
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -51,12 +51,12 @@ static unsigned int bufsiz; /* current size of buf         */
 char *
 formataddr (char *orig, char *str)
 {
-    register int len;
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int len;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index e97447bd6875c1cc6e18b677b759326097b912de..4f60cebbd4ea880e5f57db84b52fc2085293cfd1 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -347,9 +347,9 @@ static void free_comptable(void);
 static struct ftable *
 lookup(char *name)
 {
-    register struct ftable *t = functable;
-    register char *nm;
-    register char c = *name;
+    struct ftable *t = functable;
+    char *nm;
+    char c = *name;
 
     while ((nm = t->name)) {
        if (*nm == c && strcmp (nm, name) == 0)
@@ -389,7 +389,7 @@ compile_error(char *str, char *cp)
 int
 fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 {
-    register char *cp;
+    char *cp;
     size_t i;
     static int comptable_initialized = 0;
 
@@ -426,8 +426,8 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 static char *
 compile (char *sp)
 {
-    register char *cp = sp;
-    register int  c;
+    char *cp = sp;
+    int  c;
 
     for (;;) {
        sp = cp;
@@ -487,13 +487,13 @@ compile (char *sp)
 static char *
 do_spec(char *sp)
 {
-    register char *cp = sp;
-    register int c;
+    char *cp = sp;
+    int c;
 #ifndef        lint
-    register int ljust = 0;
+    int ljust = 0;
 #endif /* not lint */
-    register int wid = 0;
-    register char fill = ' ';
+    int wid = 0;
+    char fill = ' ';
 
     c = *cp++;
     if (c == '-') {
@@ -543,9 +543,9 @@ do_spec(char *sp)
 static char *
 do_name(char *sp, int preprocess)
 {
-    register char *cp = sp;
-    register int c;
-    register int i;
+    char *cp = sp;
+    int c;
+    int i;
     static int primed = 0;
 
     while (isalnum(c = *cp++) || c == '-' || c == '_')
@@ -606,10 +606,10 @@ do_name(char *sp, int preprocess)
 static char *
 do_func(char *sp)
 {
-    register char *cp = sp;
-    register int c;
-    register struct ftable *t;
-    register int n;
+    char *cp = sp;
+    int c;
+    struct ftable *t;
+    int n;
     int mflag;         /* minus sign in NUM */
 
     infunction++;
@@ -770,8 +770,8 @@ do_func(char *sp)
 static char *
 do_expr (char *sp, int preprocess)
 {
-    register char *cp = sp;
-    register int  c;
+    char *cp = sp;
+    int  c;
 
     if ((c = *cp++) == '{') {
        cp = do_name (cp, preprocess);
@@ -831,7 +831,7 @@ do_expr (char *sp, int preprocess)
 static char *
 do_loop(char *sp)
 {
-    register char *cp = sp;
+    char *cp = sp;
     struct format *floop;
 
     floop = next_fp;
@@ -855,10 +855,10 @@ do_loop(char *sp)
 static char *
 do_if(char *sp)
 {
-    register char *cp = sp;
-    register struct format *fexpr,
+    char *cp = sp;
+    struct format *fexpr,
                           *fif = (struct format *)NULL;
-    register int c = '<';
+    int c = '<';
 
     for (;;) {
        if (c == '<') {                 /* doing an IF */

diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index 9ee8956151113c60dc662c7d1069a0e715af3902..078831a589e2ec4a7ccc281f2db3b94f17a66251 100644 (file)
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -28,7 +28,7 @@ char *
 new_fs (char *form, char *format, char *default_fs)
 {
     struct stat st;
-    register FILE *fp;
+    FILE *fp;
 
     if (formats)
        free (formats);

diff --git a/sbr/getfolder.c b/sbr/getfolder.c
index 6c6d26728d162e0907b4d2dbce4e1bcdab9e091e..c9ed2ee30b1e896d6aceb9c0d76fdef0cb9eccaf 100644 (file)
--- a/sbr/getfolder.c
+++ b/sbr/getfolder.c
@@ -13,7 +13,7 @@
 char *
 getfolder(int wantcurrent)
 {
-    register char *folder;
+    char *folder;
 
     /*
      * If wantcurrent == 1, then try the current folder first

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index de5ac5cc1bc18f112a5006345d688d37a225e71a..d3c5e7a729c42f80408cc77b71cef7f6f42e67b2 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -14,8 +14,8 @@
 char *
 m_draft (char *folder, char *msg, int use, int *isdf)
 {
-    register char *cp;
-    register struct msgs *mp;
+    char *cp;
+    struct msgs *mp;
     static char buffer[BUFSIZ];
 
     if (*isdf == -1 || folder == NULL || *folder == '\0') {

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 0fe55499941f874e54cfc20c3a803b66ce70d050..2e1ed998791fd638d2fd381774e31505545b7527 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -484,8 +484,8 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
           FILE *iob)
 {
     m_getfld_state_t s;
-    register char *cp;
-    register int max, n, c;
+    char *cp;
+    int max, n, c;
 
     enter_getfld (gstate, iob);
     s = *gstate;
@@ -762,11 +762,11 @@ void
 m_unknown(m_getfld_state_t *gstate, FILE *iob)
 {
     m_getfld_state_t s;
-    register int c;
+    int c;
     char text[MAX_DELIMITER_SIZE];
     char from[] = "From ";
-    register char *cp;
-    register char *delimstr;
+    char *cp;
+    char *delimstr;
     unsigned int i;
 
     enter_getfld (gstate, iob);
@@ -850,7 +850,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
 static int
 m_Eom (m_getfld_state_t s)
 {
-    register int i;
+    int i;
     char text[MAX_DELIMITER_SIZE];
     char *cp;
 
@@ -894,11 +894,11 @@ m_Eom (m_getfld_state_t s)
 static char *
 matchc(int patln, char *pat, int strln, char *str)
 {
-       register char *es = str + strln - patln;
-       register char *sp;
-       register char *pp;
-       register char *ep = pat + patln;
-       register char pc = *pat++;
+       char *es = str + strln - patln;
+       char *sp;
+       char *pp;
+       char *ep = pat + patln;
+       char pc = *pat++;
 
        for(;;) {
                while (pc != *str++)

diff --git a/sbr/m_gmprot.c b/sbr/m_gmprot.c
index 92ead2d93761dd077d76753fa50ab0ddf2ed812b..27cc68b2fe8eb0f87e4544529bd9151f9d55d141 100644 (file)
--- a/sbr/m_gmprot.c
+++ b/sbr/m_gmprot.c
@@ -13,7 +13,7 @@
 int
 m_gmprot (void)
 {
-    register char *cp;
+    char *cp;
 
     return atooi ((cp = context_find ("msg-protect")) && *cp ? cp : msgprot);
 }

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 6c8c5841736fe08f9fc2e9b45f2e318031ec0ce0..1fca93c01a508a930b47c3621490e9c9a83fd9d9 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -27,7 +27,7 @@ static char *exmaildir (char *);
 char *
 m_maildir (char *folder)
 {
-    register char *cp, *ep;
+    char *cp, *ep;
 
     if ((cp = exmaildir (folder))
            && (ep = cp + strlen (cp) - 1) > cp
@@ -41,7 +41,7 @@ m_maildir (char *folder)
 char *
 m_mailpath (char *folder)
 {
-    register char *cp;
+    char *cp;
     char maildir[BUFSIZ];
 
     if (*folder != '/'
@@ -63,7 +63,7 @@ m_mailpath (char *folder)
 static char *
 exmaildir (char *folder)
 {
-    register char *cp, *pp;
+    char *cp, *pp;
 
     /* use current folder if none is specified */
     if (folder == NULL)

diff --git a/sbr/makedir.c b/sbr/makedir.c
index 6d3f0dc315525c111a44c6f69b6f589c729b4ae5..a905f331cde5b2ba32ebaa919d84a529562c2de7 100644 (file)
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -21,7 +21,7 @@ makedir (const char *dir)
     char*           folder_perms_ASCII;
     int             had_an_error = 0;
     mode_t          folder_perms, saved_umask;
-    register char*  c;
+    char*  c;
 
     context_save();     /* save the context file */
     fflush(stdout);

diff --git a/sbr/mf.c b/sbr/mf.c
index 136f94cd5d918f7927213c9c6a69aa3da7776a18..e2da81d01b1e4802c2050912868c5a26f41e4248 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -178,8 +178,8 @@ static struct adrx  adrxs2;
 struct adrx *
 getadrx (const char *addrs, int eai)
 {
-    register char *bp;
-    register struct adrx *adrxp = &adrxs2;
+    char *bp;
+    struct adrx *adrxp = &adrxs2;
 
     if (pers)
        free (pers);
@@ -449,7 +449,7 @@ phrase (char *buffer)
 static int
 route_addr (char *buffer)
 {
-    register char *pp = cp;
+    char *pp = cp;
 
     if (my_lex (buffer) == LX_AT) {
        if (route (buffer) == NOTOK)
@@ -734,7 +734,7 @@ char *
 legal_person (const char *p)
 {
     int i;
-    register const char *cp;
+    const char *cp;
     static char buffer[BUFSIZ];
 
     if (*p == '"')
@@ -754,7 +754,7 @@ int
 mfgets (FILE *in, char **bp)
 {
     int i;
-    register char *cp, *dp, *ep;
+    char *cp, *dp, *ep;
     static int len = 0;
     static char *pp = NULL;
 

diff --git a/sbr/path.c b/sbr/path.c
index 896c1ad926dcba7a3779b595d82fd73c9a3d4344..871ad22d7ccddec2ec61b160b97d0a86fa82cbd2 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -34,7 +34,7 @@ pluspath(char *name)
 char *
 path(char *name, int flag)
 {
-    register char *cp, *ep;
+    char *cp, *ep;
 
     if ((cp = expath (name, flag))
            && (ep = cp + strlen (cp) - 1) > cp
@@ -48,7 +48,7 @@ path(char *name, int flag)
 static char *
 expath (char *name, int flag)
 {
-    register char *cp, *ep;
+    char *cp, *ep;
     char buffer[BUFSIZ];
 
     if (flag == TSUBCWF) {
@@ -106,7 +106,7 @@ expath (char *name, int flag)
 static void
 compath (char *f)
 {
-    register char *cp, *dp;
+    char *cp, *dp;
 
     if (*f != '/')
        return;

diff --git a/sbr/peekc.c b/sbr/peekc.c
index 5ed8c3f166d5b0abd20358607ad64703ccffa985..3bfe42a3bcbd2e7099f413e20c49efc306871c76 100644 (file)
--- a/sbr/peekc.c
+++ b/sbr/peekc.c
@@ -13,7 +13,7 @@
 int
 peekc(FILE *fp)
 {
-    register int c;
+    int c;
 
     c = getc(fp);
     ungetc(c, fp);

diff --git a/sbr/print_sw.c b/sbr/print_sw.c
index d790db69d60604d3876ddd3b05cdf14f7aa5edd7..cc16626b2ca03477f3e12ff48d9272dded09d206 100644 (file)
--- a/sbr/print_sw.c
+++ b/sbr/print_sw.c
@@ -14,8 +14,8 @@ void
 print_sw (const char *substr, const struct swit *swp, char *prefix, FILE *fp)
 {
     int len, optno;
-    register int i;
-    register char *cp, *cp1, *sp;
+    int i;
+    char *cp, *cp1, *sp;
     char buf[128];
 
     len = strlen(substr);

diff --git a/sbr/putenv.c b/sbr/putenv.c
index dd665141c802374597020debd7e4c655974d283f..df187c045c2a863b35ebe4401d810fe3a42ae3f6 100644 (file)
--- a/sbr/putenv.c
+++ b/sbr/putenv.c
@@ -23,8 +23,8 @@ static int nvmatch (char *, char *);
 int
 m_putenv (char *name, char *value)
 {
-    register int i;
-    register char **ep, **nep, *cp;
+    int i;
+    char **ep, **nep, *cp;
 
     cp = mh_xmalloc ((size_t) (strlen (name) + strlen (value) + 2));
 

diff --git a/sbr/read_switch.c b/sbr/read_switch.c
index 4599a41c03d2f091dfff0d2257b04d53d0715d89..dcc14b787582d985ef45f2f15286d7f1816fc752 100644 (file)
--- a/sbr/read_switch.c
+++ b/sbr/read_switch.c
@@ -13,9 +13,9 @@
 int
 read_switch (const char *prompt, const struct swit *ansp)
 {
-    register int i;
-    register char *cp;
-    register const struct swit *ap;
+    int i;
+    char *cp;
+    const struct swit *ap;
     char ansbuf[BUFSIZ];
 
     for (;;) {

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 1588b53952ff010f97b1ab194ce00ccc4ee15ed9..1fe9d0366801ba9d7b98edd978ed47388edb2522 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -44,11 +44,11 @@ static struct node **opp = NULL;
 void
 readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 {
-    register int state;
-    register char *cp;
+    int state;
+    char *cp;
     char name[NAMESZ], field[BUFSIZ];
-    register struct node *np;
-    register struct procstr *ps;
+    struct node *np;
+    struct procstr *ps;
     m_getfld_state_t gstate = 0;
 
     if (npp == NULL && (npp = opp) == NULL) {

diff --git a/sbr/snprintb.c b/sbr/snprintb.c
index 0f46b353ec0c1be143c172c65ad9928466633c14..4324447b54ef84328be870cef095a6d9f65643ab 100644 (file)
--- a/sbr/snprintb.c
+++ b/sbr/snprintb.c
@@ -14,8 +14,8 @@ char *
 snprintb (char *buffer, size_t n, unsigned v, char *bits)
 {
     size_t len;
-    register int i, j;
-    register char c, *bp;
+    int i, j;
+    char c, *bp;
 
     snprintf (buffer, n, bits && *bits == 010 ? "0%o" : "0x%x", v);
     len = strlen(buffer);

diff --git a/sbr/utils.c b/sbr/utils.c
index 02e8cfb325af4c2955f47004f6819af5e9d8779b..c9769fb0b909303789d855e6000ccfea9ae8d938 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -103,7 +103,7 @@ void mh_xfree(void *ptr)
 char *
 pwd(void)
 {
-    register char *cp;
+    char *cp;
     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {

diff --git a/uip/ali.c b/uip/ali.c
index db536214f71788dfefe552a1147dfd2bb81dd068..abc7f556500353fa7cd7cfe8e0a29f61b7c75b32 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -199,9 +199,9 @@ print_aka (char *p, int list, int margin)
 static void
 print_usr (char *s, int list)
 {
-    register char *cp, *pp, *vp;
-    register struct aka *ak;
-    register struct mailname *mp, *np;
+    char *cp, *pp, *vp;
+    struct aka *ak;
+    struct mailname *mp, *np;
 
     if ((pp = getname (s)) == NULL)
        adios (NULL, "no address in \"%s\"", s);

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 65cd5e445311d94511e54d9a2714db348c172422..8462fbdce1ab2ebf40a2da0f337ec5afc5ec6264 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -51,7 +51,7 @@ static struct home *hmalloc (struct passwd *);
 char *
 akvalue (char *s)
 {
-    register char *v;
+    char *v;
 
     if (akahead == NULL)
        alias (AliasFile);
@@ -74,8 +74,8 @@ akvisible (void)
 char *
 akresult (struct aka *ak)
 {
-    register char *cp = NULL, *dp, *pp;
-    register struct adr *ad;
+    char *cp = NULL, *dp, *pp;
+    struct adr *ad;
 
     for (ad = ak->ak_addr; ad; ad = ad->ad_next) {
        pp = ad->ad_local ? akval (ak->ak_next, ad->ad_text)
@@ -156,7 +156,7 @@ akval (struct aka *ak, char *s)
 static int
 aleq (char *string, char *aliasent)
 {
-    register char c;
+    char c;
 
     while ((c = *string++))
        if (*aliasent == '*')
@@ -175,10 +175,10 @@ int
 alias (char *file)
 {
     int i;
-    register char *bp, *cp, *pp;
+    char *bp, *cp, *pp;
     char lc, *ap;
-    register struct aka *ak = NULL;
-    register FILE *fp;
+    struct aka *ak = NULL;
+    FILE *fp;
 
     if (*file != '/'
            && (strncmp (file, "./", 2) && strncmp (file, "../", 3)))
@@ -355,9 +355,9 @@ seekp (char *p, char *c, char **a)
 static int
 addfile (struct aka *ak, char *file)
 {
-    register char *cp;
+    char *cp;
     char buffer[BUFSIZ];
-    register FILE *fp;
+    FILE *fp;
 
     if (!(fp = fopen (etcpath (file), "r"))) {
        akerrst = file;
@@ -376,9 +376,9 @@ addfile (struct aka *ak, char *file)
 static int
 addgroup (struct aka *ak, char *grp)
 {
-    register char *gp;
-    register struct group *gr = getgrnam (grp);
-    register struct home *hm = NULL;
+    char *gp;
+    struct group *gr = getgrnam (grp);
+    struct home *hm = NULL;
 
     if (!gr)
        gr = getgrgid (atoi (grp));
@@ -410,8 +410,8 @@ static int
 addmember (struct aka *ak, char *grp)
 {
     gid_t gid;
-    register struct group *gr = getgrnam (grp);
-    register struct home *hm = NULL;
+    struct group *gr = getgrnam (grp);
+    struct home *hm = NULL;
 
     if (gr)
        gid = gr->gr_gid;
@@ -472,7 +472,7 @@ getalias (char *addrs)
 static void
 add_aka (struct aka *ak, char *pp)
 {
-    register struct adr *ad, *ld;
+    struct adr *ad, *ld;
 
     for (ad = ak->ak_addr, ld = NULL; ad; ld = ad, ad = ad->ad_next)
        if (!strcmp (pp, ad->ad_text))
@@ -492,7 +492,7 @@ add_aka (struct aka *ak, char *pp)
 void
 init_pw (void)
 {
-    register struct passwd  *pw;
+    struct passwd  *pw;
     static int init;
   
     if (!init)
@@ -517,7 +517,7 @@ init_pw (void)
 static struct aka *
 akalloc (char *id)
 {
-    register struct aka *p;
+    struct aka *p;
 
     NEW(p);
     p->ak_name = getcpy (id);
@@ -537,7 +537,7 @@ akalloc (char *id)
 static struct home *
 hmalloc (struct passwd *pw)
 {
-    register struct home *p;
+    struct home *p;
 
     NEW(p);
     p->h_name = getcpy (pw->pw_name);

diff --git a/uip/ap.c b/uip/ap.c
index 92b765afeec566ee04311af73125d650df8bca93..dff6dc4370e182ff8f6d3d1b8dc7b5448cf111c7 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -146,12 +146,12 @@ static int
 process (char *arg, int length)
 {
     int        status = 0;
-    register char *cp;
+    char *cp;
     char error[BUFSIZ];
-    register struct comp *cptr;
-    register struct pqpair *p, *q;
+    struct comp *cptr;
+    struct pqpair *p, *q;
     struct pqpair pq;
-    register struct mailname *mp;
+    struct mailname *mp;
 
     (q = &pq)->pq_next = NULL;
     while ((cp = getname (arg))) {

diff --git a/uip/burst.c b/uip/burst.c
index c156076a57e599f1ed701e8867d492d50e3e394a..0cfb4065125bb773e95664521ad4c0e99a6fedbf 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -507,7 +507,7 @@ burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
 static void
 cpybrst (FILE *in, FILE *out, char *ifile, char *ofile, int len, int mime)
 {
-    register int c, state;
+    int c, state;
 
     for (state = mime ? S4 : S1; (c = fgetc (in)) != EOF && len > 0; len--) {
        if (c == 0)

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 2d9239e92fd4495f627ceaf1d2896fa23af9ef25..305237785accf02bb2a55ee925436da00e6b2ecf 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -30,7 +30,7 @@ distout (char *drft, char *msgnam, char *backup)
     int state;
     char *dp, *resent;
     char name[NAMESZ], buffer[BUFSIZ];
-    register FILE *ifp, *ofp;
+    FILE *ifp, *ofp;
     m_getfld_state_t gstate = 0;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
@@ -127,7 +127,7 @@ ready_msg (char *msgnam)
 {
     int state, out;
     char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
-    register FILE *ifp, *ofp;
+    FILE *ifp, *ofp;
     char *cp = NULL;
     m_getfld_state_t gstate = 0;
 

diff --git a/uip/dp.c b/uip/dp.c
index 097b961d2cab83fc09493f718a2b2870660b18e7..6909239bb14341b245b6b8306bc33ae104881b1e 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -138,7 +138,7 @@ process (char *date, int length)
     int status = 0;
     charstring_t scanl =
        charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
-    register struct comp *cptr;
+    struct comp *cptr;
 
     cptr = fmt_findcomp ("text");
     if (cptr) {

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 0d87a06d48d3ffb3461f11139a10e10e14e1f926..6f7f365283a57e0c5ae056492b3dcd9c862929f7 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -158,11 +158,11 @@ mbx_chk_mmdf (int fd)
 int
 mbx_read (FILE *fp, long pos, struct drop **drops)
 {
-    register int len, size;
-    register long ld1, ld2;
-    register char *bp;
+    int len, size;
+    long ld1, ld2;
+    char *bp;
     char buffer[BUFSIZ];
-    register struct drop *cp, *dp, *ep, *pp;
+    struct drop *cp, *dp, *ep, *pp;
 
     len = MAXFOLDER;
     pp = mh_xcalloc(len, sizeof *pp);
@@ -201,7 +201,7 @@ mbx_read (FILE *fp, long pos, struct drop **drops)
        pos += ld2;
 
        if (dp >= ep) {
-           register int    curlen = dp - pp;
+           int    curlen = dp - pp;
 
            cp = (struct drop *) mh_xrealloc ((char *) pp,
                                    (size_t) (len += MAXFOLDER) * sizeof(*pp));
@@ -221,10 +221,10 @@ int
 mbx_write(char *mailbox, int md, FILE *fp, int id, long last,
            long pos, off_t stop, int mapping, int noisy)
 {
-    register int i, j, size;
+    int i, j, size;
     off_t start;
     long off;
-    register char *cp;
+    char *cp;
     char buffer[BUFSIZ];
 
     off = (long) lseek (md, (off_t) 0, SEEK_CUR);
@@ -428,9 +428,9 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 int
 mbx_size (int md, off_t start, off_t stop)
 {
-    register int i, fd;
-    register long pos;
-    register FILE *fp;
+    int i, fd;
+    long pos;
+    FILE *fp;
 
     if ((fd = dup (md)) == NOTOK || (fp = fdopen (fd, "r")) == NULL) {
        if (fd != NOTOK)
@@ -469,7 +469,7 @@ mbx_close (char *mailbox, int md)
 char *
 map_name (char *file)
 {
-    register char *cp, *dp;
+    char *cp, *dp;
     static char buffer[BUFSIZ];
 
     if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
@@ -487,10 +487,10 @@ map_name (char *file)
 int
 map_read (char *file, long pos, struct drop **drops, int noisy)
 {
-    register int i, md, msgp;
-    register char *cp;
+    int i, md, msgp;
+    char *cp;
     struct drop d;
-    register struct drop *mp, *dp;
+    struct drop *mp, *dp;
 
     if ((md = open (cp = map_name (file), O_RDONLY)) == NOTOK
            || map_chk (cp, md, mp = &d, pos, noisy)) {
@@ -510,7 +510,7 @@ map_read (char *file, long pos, struct drop **drops, int noisy)
        free ((char *) dp);
     } else {
 #ifdef NTOHLSWAP
-       register struct drop *tdp;
+       struct drop *tdp;
        int j;
 
        for (j = 0, tdp = dp; j < i / sizeof(*dp); j++, tdp++) {
@@ -533,12 +533,12 @@ int
 map_write (char *mailbox, int md, int id, long last, off_t start,
            off_t stop, long pos, int size, int noisy)
 {
-    register int i;
+    int i;
     int clear, fd, td;
     char *file;
-    register struct drop *dp;
+    struct drop *dp;
     struct drop d1, d2, *rp;
-    register FILE *fp;
+    FILE *fp;
     struct stat st;
 
     if ((fd = map_open (file = map_name (mailbox), md)) == NOTOK)
@@ -648,7 +648,7 @@ map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
 {
     ssize_t count;
     struct drop d, tmpd;
-    register struct drop *dl;
+    struct drop *dl;
 
     if (read (fd, (char *) &tmpd, sizeof(*dp)) != sizeof(*dp)) {
 #ifdef notdef

diff --git a/uip/flist.c b/uip/flist.c
index 829500d625c69f0fa60e3f5fc4c053f30adb982a..4a38938c9b4ddab0a86d363fe26b3205faa508d4 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -668,7 +668,7 @@ do_readonly_folders (void)
 {
     int atrlen;
     char atrcur[BUFSIZ];
-    register struct node *np;
+    struct node *np;
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 3cf18d35175b0350b9b8d5d0ec2867fa60b4c04e..594a46149fcee6e06a2807d2c6b7d6dd4453065d 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -110,7 +110,7 @@ static void
 fmt_dump (struct format *fmth)
 {
        int i;
-       register struct format *fmt, *addr;
+       struct format *fmt, *addr;
 
        /* Assign labels */
        for (fmt = fmth; fmt; ++fmt) {
@@ -142,7 +142,7 @@ fmt_dump (struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-       register int i;
+       int i;
 
        if ((i = findlabel(fmt)) >= 0)
                printf("L%d:", i);
@@ -322,7 +322,7 @@ dumpone(struct format *fmt)
 static int
 findlabel(struct format *addr)
 {
-       register int i;
+       int i;
 
        for (i = 0; i < lused; ++i)
                if (addr == lvec[i])
@@ -454,7 +454,7 @@ f_typestr(int t)
 static char *
 c_typestr(int t)
 {
-       register int i;
+       int i;
        static char buf[64];
 
        buf[0] = '\0';
@@ -471,7 +471,7 @@ c_typestr(int t)
 static char *
 c_flagsstr(int t)
 {
-       register int i;
+       int i;
        static char buf[64];
 
        buf[0] = '\0';

diff --git a/uip/fmttest.c b/uip/fmttest.c
index d6026b95db0b9f4871499d7ed75c74d5781646ca..b0c869cb9c24d66bb1f57bba48560b78b0ed9d08 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -777,7 +777,7 @@ fmt_dump (char *nfs, struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-       register int i;
+       int i;
 
        if ((i = findlabel(fmt)) >= 0)
                printf("L%d:", i);
@@ -989,7 +989,7 @@ initlabels(struct format *fmth)
 static int
 findlabel(struct format *addr)
 {
-       register int i;
+       int i;
 
        for (i = 0; i < lused; ++i)
                if (addr == lvec[i])
@@ -1223,13 +1223,13 @@ static unsigned int bufsiz=0;   /* current size of buf */
 static char *
 test_formataddr (char *orig, char *str)
 {
-    register int len;
+    int len;
     char error[BUFSIZ];
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {

diff --git a/uip/folder.c b/uip/folder.c
index d71b43f056ff47ed17622ef0f9cdad36a5c78170..3f032904ea30d5952a9d98296b05569a234e2706 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -634,7 +634,7 @@ readonly_folders (void)
 {
     int        atrlen;
     char atrcur[BUFSIZ];
-    register struct node *np;
+    struct node *np;
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);

diff --git a/uip/forw.c b/uip/forw.c
index c4e1dde5271af314cea033b287a2c85f7a091a33..7b4203a6b9dab998325880bad45aa20e53c3337a 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -568,7 +568,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 {
     int fd,i, msgcnt, msgnum;
     int len, buflen;
-    register char *bp, *msgnam;
+    char *bp, *msgnam;
     char buffer[BUFSIZ];
 
     msgcnt = 1;

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 97d1f3d328ddcba3c3aa0cf5cce4b4e221dabc24..928d9c3ab994664b6de03d35e564c7d6996b6e7f 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -48,11 +48,11 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
     int        in;
     int fmtsize, state;
     int i;
-    register char *nfs;
+    char *nfs;
     char tmpfil[BUFSIZ], name[NAMESZ], **ap;
     charstring_t line;
     FILE *tmp;
-    register struct comp *cptr;
+    struct comp *cptr;
     struct format *fmt;
     char *cp = NULL;
     m_getfld_state_t gstate = 0;

diff --git a/uip/mhparam.c b/uip/mhparam.c
index a2a7489a1b2373959567b619bca6a1440511f4be..bf0dfae7bff973b7724f0bf5da2da8a0fe9e03cf 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -235,7 +235,7 @@ main(int argc, char **argv)
            components = compp > 1;
 
        for (i = 0; i < compp; i++)  {
-           register char *value;
+           char *value;
 
            if (! strcmp ("spoollocking", comps[i])) {
                /* In case spoollocking was set in mts.conf. */

diff --git a/uip/pick.c b/uip/pick.c
index fb339d46e6731f6f7e2015246a0a5d571df5f1ef..9b2e0cded306b1187d1f12b2e57978af95608111 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgnum_array nums = { 0, 0, NULL };
     struct msgs *mp, *mp2;
-    register FILE *fp;
+    FILE *fp;
     int debug = 0;
     int reverse = 0;
     int start, end, inc;

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 5ef4fc5826fbb613e3899994b14ea13ac2159517..0085b7a008679a8c33eabb33c03e1587f874e9bb 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -214,8 +214,8 @@ pcompile (char **vec, char *date)
 static struct nexus *
 parse (void)
 {
-    register char  *cp;
-    register struct nexus *n, *o;
+    char  *cp;
+    struct nexus *n, *o;
 
     if ((n = nexp1 ()) == NULL || (cp = nxtarg ()) == NULL)
        return n;
@@ -256,8 +256,8 @@ header: ;
 static struct nexus *
 nexp1 (void)
 {
-    register char *cp;
-    register struct nexus *n, *o;
+    char *cp;
+    struct nexus *n, *o;
 
     if ((n = nexp2 ()) == NULL || (cp = nxtarg ()) == NULL)
        return n;
@@ -302,8 +302,8 @@ header: ;
 static struct nexus *
 nexp2 (void)
 {
-    register char *cp;
-    register struct nexus *n;
+    char *cp;
+    struct nexus *n;
 
     if ((cp = nxtarg ()) == NULL)
        return NULL;
@@ -344,9 +344,9 @@ static struct nexus *
 nexp3 (void)
 {
     int i;
-    register char *cp, *dp;
+    char *cp, *dp;
     char buffer[BUFSIZ], temp[64];
-    register struct nexus *n;
+    struct nexus *n;
 
     if ((cp = nxtarg ()) == NULL)
        return NULL;
@@ -457,7 +457,7 @@ nexp3 (void)
 static struct nexus *
 newnexus (int (*action)())
 {
-    register struct nexus *p;
+    struct nexus *p;
 
     NEW0(p);
     p->n_action = action;
@@ -468,8 +468,8 @@ newnexus (int (*action)())
 #define        args(a) a, fp, msgnum, start, stop
 #define        params  args (n)
 #define        plist   \
-           register struct nexus  *n; \
-           register FILE *fp; \
+           struct nexus  *n; \
+           FILE *fp; \
            int msgnum; \
            long    start, \
                    stop;
@@ -490,7 +490,7 @@ pmatches (FILE *fp, int msgnum, long start, long stop, int debug)
 static void
 PRaction (struct nexus *n, int level)
 {
-    register int i;
+    int i;
 
     for (i = 0; i < level; i++)
        fprintf (stderr, "| ");
@@ -559,9 +559,9 @@ plist
 static int
 gcompile (struct nexus *n, char *astr)
 {
-    register int c;
+    int c;
     int cclcnt;
-    register unsigned char *ep, *dp, *sp, *lastep = 0;
+    unsigned char *ep, *dp, *sp, *lastep = 0;
 
     dp = (ep = (unsigned char *) n->n_expbuf) + sizeof n->n_expbuf;
     sp = (unsigned char *) astr;
@@ -651,7 +651,7 @@ plist
 {
     int c, body, lf;
     long pos = start;
-    register char *p1, *p2, *ebp, *cbp;
+    char *p1, *p2, *ebp, *cbp;
     char ibuf[BUFSIZ];
     NMH_UNUSED (msgnum);
 
@@ -741,7 +741,7 @@ plist
 static int
 advance (char *alp, char *aep)
 {
-    register unsigned char *lp, *ep, *curlp;
+    unsigned char *lp, *ep, *curlp;
 
     lp = (unsigned char *)alp;
     ep = (unsigned char *)aep;
@@ -818,8 +818,8 @@ advance (char *alp, char *aep)
 static int
 cclass (unsigned char *aset, int ac, int af)
 {
-    register unsigned int    n;
-    register unsigned char   c, *set;
+    unsigned int    n;
+    unsigned char   c, *set;
 
     set = aset;
     if ((c = ac) == 0)
@@ -837,7 +837,7 @@ cclass (unsigned char *aset, int ac, int af)
 static int
 tcompile (char *ap, struct tws *tb, int isafter)
 {
-    register struct tws *tw;
+    struct tws *tw;
 
     if ((tw = tws_parse (ap, isafter)) == NULL)
        return 0;
@@ -851,7 +851,7 @@ static struct tws *
 tws_parse (char *ap, int isafter)
 {
     char buffer[BUFSIZ];
-    register struct tws *tw, *ts;
+    struct tws *tw, *ts;
 
     if ((tw = tws_special (ap)) != NULL) {
        tw->tw_sec = tw->tw_min = isafter ? 59 : 0;
@@ -893,7 +893,7 @@ tws_special (char *ap)
 {
     int i;
     time_t clock;
-    register struct tws *tw;
+    struct tws *tw;
 
     time (&clock);
     if (!strcasecmp (ap, "today"))
@@ -932,9 +932,9 @@ TWSaction (params)
 plist
 {
     int state;
-    register char *bp;
+    char *bp;
     char buf[BUFSIZ], name[NAMESZ];
-    register struct tws *tw;
+    struct tws *tw;
     m_getfld_state_t gstate = 0;
     NMH_UNUSED (stop);
 

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 29b341cadca3835d6222e87ec2e48ceb646c5c8e..7e70e3ea69737fac7e2bea2512480312f9854a94 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -173,11 +173,11 @@ static char *addrcomps[] = {
 static void
 rcvdistout (FILE *inb, char *form, char *addrs)
 {
-    register int char_read = 0, format_len, i, state;
-    register char **ap;
+    int char_read = 0, format_len, i, state;
+    char **ap;
     char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
     charstring_t scanl;
-    register struct comp *cptr;
+    struct comp *cptr;
     FILE *out;
     m_getfld_state_t gstate = 0;
 

diff --git a/uip/refile.c b/uip/refile.c
index 5d03d4d18569463807f9153ecdf760a5b0a3382e..6f8438d0b8a882566fb98871df75eb6e704904ff 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -275,8 +275,8 @@ static void
 opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
 {
     char nmaildir[BUFSIZ];
-    register struct st_fold *fp, *ep;
-    register struct msgs *mp;
+    struct st_fold *fp, *ep;
+    struct msgs *mp;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
        if (chdir (m_maildir ("")) < 0) {
@@ -319,8 +319,8 @@ opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
 static void
 clsfolds (struct st_fold *folders, int nfolders)
 {
-    register struct st_fold *fp, *ep;
-    register struct msgs *mp;
+    struct st_fold *fp, *ep;
+    struct msgs *mp;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
        mp = fp->f_mp;

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 983fd28b767843e8bf6c86b8739ad19b45b6cd60..80d1ff67d95d69c960c4f0fbd0ac05f0f587aab6 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -65,11 +65,11 @@ void
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
        int mime, char *form, char *filter, char *fcc, int fmtproc)
 {
-    register int state, i;
-    register struct comp *cptr;
+    int state, i;
+    struct comp *cptr;
     char tmpbuf[SBUFSIZ];
     struct format *fmt;
-    register char **ap;
+    char **ap;
     int        char_read = 0, format_len, mask;
     char name[NAMESZ], *cp;
     charstring_t scanl;
@@ -187,7 +187,7 @@ finished:
      */
     cptr = fmt_findcomp ("subject");
     if (cptr && (cp = cptr->c_text)) {
-       register char *sp = cp;
+       char *sp = cp;
 
        for (;;) {
            while (isspace((unsigned char) *cp))
@@ -285,13 +285,13 @@ static unsigned int bufsiz=0;     /* current size of buf */
 static char *
 replformataddr (char *orig, char *str)
 {
-    register int len;
+    int len;
     char baddr[BUFSIZ], error[BUFSIZ];
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
     char *fixed_str = fix_addresses (str);
 
     /* if we don't have a buffer yet, get one */
@@ -382,7 +382,7 @@ static int
 insert (struct mailname *np)
 {
     char buffer[BUFSIZ];
-    register struct mailname *mp;
+    struct mailname *mp;
 
     if (nodupcheck)
        return 1;

diff --git a/uip/rmf.c b/uip/rmf.c
index f714c472bcbb40b5fbfa9b3ff78f0c0545d24a0b..f6cb4e829fdcfcfd55d2ec3eb898a3d42502ba54 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -124,10 +124,10 @@ static int
 rmf (char *folder)
 {
     int i, j, others;
-    register char *maildir;
+    char *maildir;
     char cur[BUFSIZ];
-    register struct dirent *dp;
-    register DIR *dd;
+    struct dirent *dp;
+    DIR *dd;
 
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
@@ -212,9 +212,9 @@ rmf (char *folder)
 static void
 rma (char *folder)
 {
-    register int alen, j, plen;
-    register char *cp;
-    register struct node *np, *pp;
+    int alen, j, plen;
+    char *cp;
+    struct node *np, *pp;
 
     alen = strlen ("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;

diff --git a/uip/sortm.c b/uip/sortm.c
index ff3f35191a8b25bd33428a312342af511e381b73..f0d3248a8e8210d8d37db40cc4cd2c49d1a496fa 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -242,7 +242,7 @@ main (int argc, char **argv)
      */
     if (!submajor && subjsort) {       /* already date sorted */
        struct smsg **slist, **flist;
-       register struct smsg ***il, **fp, **dp;
+       struct smsg ***il, **fp, **dp;
 
        slist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*slist));
        memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));
@@ -263,7 +263,7 @@ main (int argc, char **argv)
        flist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*flist));
        fp = flist;
        for (dp = dlist; *dp;) {
-           register struct smsg **s = il[(*dp++)->s_msg];
+           struct smsg **s = il[(*dp++)->s_msg];
 
            /* see if we already did this guy */
            if (! s)
@@ -311,7 +311,7 @@ read_hdrs (struct msgs *mp, char *datesw)
 {
     int msgnum;
     struct tws tb;
-    register struct smsg *s;
+    struct smsg *s;
 
     twscopy (&tb, dlocaltimenow ());
 
@@ -338,12 +338,12 @@ read_hdrs (struct msgs *mp, char *datesw)
 static int
 get_fields (char *datesw, int msg, struct smsg *smsg)
 {
-    register int state;
+    int state;
     int compnum;
     char *msgnam, buf[BUFSIZ], nam[NAMESZ];
-    register struct tws *tw;
-    register char *datecomp = NULL, *subjcomp = NULL;
-    register FILE *in;
+    struct tws *tw;
+    char *datecomp = NULL, *subjcomp = NULL;
+    FILE *in;
     m_getfld_state_t gstate = 0;
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
@@ -433,7 +433,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
             * leading "re:", everything but letters & smash
             * letters to lower case.
             */
-           register char  *cp, *cp2, c;
+           char  *cp, *cp2, c;
 
            cp = subjcomp;
            cp2 = subjcomp;
@@ -491,7 +491,7 @@ dsort (struct smsg **a, struct smsg **b)
 static int
 subsort (struct smsg **a, struct smsg **b)
 {
-    register int i;
+    int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
        return (i);
@@ -502,7 +502,7 @@ subsort (struct smsg **a, struct smsg **b)
 static int
 txtsort (struct smsg **a, struct smsg **b)
 {
-    register int i;
+    int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
        return (i);

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 8fc6ee727e185d628bfc751a48fa4745836c28bf..90e72d65679a2f300302886ce5a7df8c40dc362d 100644 (file)
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -26,7 +26,7 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
 {
     int found, k, msgnum, vecp;
     int len, buflen;
-    register char *bp;
+    char *bp;
     char buffer[BUFSIZ], *vec[MAXARGS];
 
     vecp = 0;