From: Ralph Corderoy Date: Mon, 17 Oct 2016 19:14:33 +0000 (+0100) Subject: Remove use of C's register keyword. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1?ds=inline;hp=99f48bb3a2617b5a81355fc45d1198863e6043d0 Remove use of C's register keyword. --- diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index 70ddb8db..bc93672a 100644 --- 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 d62de170..6a4e5330 100644 --- 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 6695e084..b75f0e29 100644 --- 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 e6cdc73d..5889a17f 100644 --- 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 aabac558..e8407066 100644 --- 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 de14b0d5..adaa172b 100644 --- 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 0e9e1146..907acb35 100644 --- 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 27d55e9e..62bc48e6 100644 --- 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 12829f13..55df3fc6 100644 --- 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 67de2a50..ec025be5 100644 --- 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 bae6ac5c..f1beb5c3 100644 --- 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 db4838f4..7f06ec7c 100644 --- 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 07c0cecf..b3db6288 100644 --- 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 e97447bd..4f60cebb 100644 --- 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 9ee89561..078831a5 100644 --- 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 6c6d2672..c9ed2ee3 100644 --- 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 de5ac5cc..d3c5e7a7 100644 --- 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 0fe55499..2e1ed998 100644 --- 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 92ead2d9..27cc68b2 100644 --- 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 6c8c5841..1fca93c0 100644 --- 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 6d3f0dc3..a905f331 100644 --- 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 136f94cd..e2da81d0 100644 --- 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 896c1ad9..871ad22d 100644 --- 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 5ed8c3f1..3bfe42a3 100644 --- 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 d790db69..cc16626b 100644 --- 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 dd665141..df187c04 100644 --- 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 4599a41c..dcc14b78 100644 --- 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 1588b539..1fe9d036 100644 --- 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 0f46b353..4324447b 100644 --- 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 02e8cfb3..c9769fb0 100644 --- 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 db536214..abc7f556 100644 --- 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 65cd5e44..8462fbdc 100644 --- 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 92b765af..dff6dc43 100644 --- 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 c156076a..0cfb4065 100644 --- 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 2d9239e9..30523778 100644 --- 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 097b961d..6909239b 100644 --- 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 0d87a06d..6f7f3652 100644 --- 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 829500d6..4a38938c 100644 --- 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 3cf18d35..594a4614 100644 --- 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 d6026b95..b0c869cb 100644 --- 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 d71b43f0..3f032904 100644 --- 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 c4e1dde5..7b4203a6 100644 --- 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 97d1f3d3..928d9c3a 100644 --- 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 a2a7489a..bf0dfae7 100644 --- 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 fb339d46..9b2e0cde 100644 --- 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 5ef4fc58..0085b7a0 100644 --- 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 29b341ca..7e70e3ea 100644 --- 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 5d03d4d1..6f8438d0 100644 --- 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 983fd28b..80d1ff67 100644 --- 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 f714c472..f6cb4e82 100644 --- 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 ff3f3519..f0d3248a 100644 --- 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 8fc6ee72..90e72d65 100644 --- 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;