less is code imported on a regular basis from upstream. Look at the commit log.
> Every one of these is in a var declaration, so a megadiff is probably > the easiest way to do it. > > ok? > > > Index: brac.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/brac.c,v > retrieving revision 1.6 > diff -u -p -r1.6 brac.c > --- brac.c 25 Apr 2014 13:38:21 -0000 1.6 > +++ brac.c 1 Nov 2015 19:19:16 -0000 > @@ -25,13 +25,13 @@ > */ > public void > match_brac(obrac, cbrac, forwdir, n) > - register int obrac; > - register int cbrac; > + int obrac; > + int cbrac; > int forwdir; > int n; > { > - register int c; > - register int nest; > + int c; > + int nest; > POSITION pos; > int (*chget)(); > > Index: ch.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/ch.c,v > retrieving revision 1.10 > diff -u -p -r1.10 ch.c > --- ch.c 25 Apr 2014 13:38:21 -0000 1.10 > +++ ch.c 1 Nov 2015 19:19:16 -0000 > @@ -144,11 +144,11 @@ static int ch_addbuf(); > int > ch_get() > { > - register struct buf *bp; > - register struct bufnode *bn; > - register int n; > - register int slept; > - register int h; > + struct buf *bp; > + struct bufnode *bn; > + int n; > + int slept; > + int h; > POSITION pos; > POSITION len; > > @@ -410,8 +410,8 @@ end_logfile() > public void > sync_logfile() > { > - register struct buf *bp; > - register struct bufnode *bn; > + struct buf *bp; > + struct bufnode *bn; > int warned = FALSE; > BLOCKNUM block; > BLOCKNUM nblocks; > @@ -448,9 +448,9 @@ sync_logfile() > buffered(block) > BLOCKNUM block; > { > - register struct buf *bp; > - register struct bufnode *bn; > - register int h; > + struct buf *bp; > + struct bufnode *bn; > + int h; > > h = BUFHASH(block); > FOR_BUFS_IN_CHAIN(h, bn) > @@ -468,7 +468,7 @@ buffered(block) > */ > public int > ch_seek(pos) > - register POSITION pos; > + POSITION pos; > { > BLOCKNUM new_block; > POSITION len; > @@ -537,8 +537,8 @@ ch_end_seek() > public int > ch_beg_seek() > { > - register struct bufnode *bn; > - register struct bufnode *firstbn; > + struct bufnode *bn; > + struct bufnode *firstbn; > > /* > * Try a plain ch_seek first. > @@ -595,7 +595,7 @@ ch_tell() > public int > ch_forw_get() > { > - register int c; > + int c; > > if (thisfile == NULL) > return (EOI); > @@ -658,7 +658,7 @@ ch_setbufspace(bufspace) > public void > ch_flush() > { > - register struct bufnode *bn; > + struct bufnode *bn; > > if (thisfile == NULL) > return; > @@ -725,8 +725,8 @@ ch_flush() > static int > ch_addbuf() > { > - register struct buf *bp; > - register struct bufnode *bn; > + struct buf *bp; > + struct bufnode *bn; > > /* > * Allocate and initialize a new buffer and link it > @@ -750,7 +750,7 @@ ch_addbuf() > static void > init_hashtbl() > { > - register int h; > + int h; > > for (h = 0; h < BUFHASH_SIZE; h++) > { > @@ -765,7 +765,7 @@ init_hashtbl() > static void > ch_delbufs() > { > - register struct bufnode *bn; > + struct bufnode *bn; > > while (ch_bufhead != END_OF_CHAIN) > { > Index: charset.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/charset.c,v > retrieving revision 1.10 > diff -u -p -r1.10 charset.c > --- charset.c 25 Apr 2014 13:38:21 -0000 1.10 > +++ charset.c 1 Nov 2015 19:19:16 -0000 > @@ -134,9 +134,9 @@ public int binattr = AT_STANDOUT; > ichardef(s) > char *s; > { > - register char *cp; > - register int n; > - register char v; > + char *cp; > + int n; > + char v; > > n = 0; > v = 0; > @@ -189,11 +189,11 @@ ichardef(s) > */ > static int > icharset(name, no_error) > - register char *name; > + char *name; > int no_error; > { > - register struct charset *p; > - register struct cs_alias *a; > + struct charset *p; > + struct cs_alias *a; > > if (name == NULL || *name == '\0') > return (0); > @@ -233,7 +233,7 @@ icharset(name, no_error) > static void > ilocale() > { > - register int c; > + int c; > > for (c = 0; c < (int) sizeof(chardef); c++) > { > Index: cmdbuf.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/cmdbuf.c,v > retrieving revision 1.7 > diff -u -p -r1.7 cmdbuf.c > --- cmdbuf.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ cmdbuf.c 1 Nov 2015 19:19:16 -0000 > @@ -525,7 +525,7 @@ cmd_ichar(cs, clen) > static int > cmd_erase() > { > - register char *s; > + char *s; > int clen; > > if (cp == cmdbuf) > Index: command.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/command.c,v > retrieving revision 1.17 > diff -u -p -r1.17 command.c > --- command.c 10 May 2014 20:09:38 -0000 1.17 > +++ command.c 1 Nov 2015 19:19:16 -0000 > @@ -204,7 +204,7 @@ mca_opt_toggle() > static void > exec_mca() > { > - register char *cbuf; > + char *cbuf; > > cmd_exec(); > cbuf = get_cmdbuf(); > @@ -691,7 +691,7 @@ make_display() > static void > prompt() > { > - register constant char *p; > + constant char *p; > > if (ungot != NULL) > { > @@ -862,7 +862,7 @@ ungetcc(c) > ungetsc(s) > char *s; > { > - register char *p; > + char *p; > > for (p = s + strlen(s) - 1; p >= s; p--) > ungetcc(*p); > @@ -878,7 +878,7 @@ multi_search(pattern, n) > char *pattern; > int n; > { > - register int nomore; > + int nomore; > IFILE save_ifile; > int changed_file; > > @@ -1013,9 +1013,9 @@ forw_loop(until_hilite) > public void > commands() > { > - register int c; > - register int action; > - register char *cbuf; > + int c; > + int action; > + char *cbuf; > int newaction; > int save_search_type; > char *extra; > Index: cvt.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/cvt.c,v > retrieving revision 1.3 > diff -u -p -r1.3 cvt.c > --- cvt.c 25 Apr 2014 13:38:21 -0000 1.3 > +++ cvt.c 1 Nov 2015 19:19:16 -0000 > @@ -65,7 +65,7 @@ cvt_text(odst, osrc, chpos, lenp, ops) > char *dst; > char *edst = odst; > char *src; > - register char *src_end; > + char *src_end; > LWCHAR ch; > > if (lenp != NULL) > Index: decode.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/decode.c,v > retrieving revision 1.7 > diff -u -p -r1.7 decode.c > --- decode.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ decode.c 1 Nov 2015 19:19:16 -0000 > @@ -232,9 +232,9 @@ expand_special_keys(table, len) > char *table; > int len; > { > - register char *fm; > - register char *to; > - register int a; > + char *fm; > + char *to; > + int a; > char *repl; > int klen; > > @@ -324,7 +324,7 @@ add_cmd_table(tlist, buf, len) > char *buf; > int len; > { > - register struct tablelist *t; > + struct tablelist *t; > > if (len == 0) > return (0); > @@ -392,9 +392,9 @@ cmd_search(cmd, table, endtable, sp) > char *endtable; > char **sp; > { > - register char *p; > - register char *q; > - register int a; > + char *p; > + char *q; > + int a; > > *sp = NULL; > for (p = table, q = cmd; p < endtable; p++, q++) > @@ -483,8 +483,8 @@ cmd_decode(tlist, cmd, sp) > char *cmd; > char **sp; > { > - register struct tablelist *t; > - register int action = A_INVALID; > + struct tablelist *t; > + int action = A_INVALID; > > /* > * Search thru all the command tables. > @@ -594,8 +594,8 @@ new_lesskey(buf, len, sysvar) > int sysvar; > { > char *p; > - register int c; > - register int n; > + int c; > + int n; > > /* > * New-style lesskey file. > @@ -646,10 +646,10 @@ lesskey(filename, sysvar) > char *filename; > int sysvar; > { > - register char *buf; > - register POSITION len; > - register long n; > - register int f; > + char *buf; > + POSITION len; > + long n; > + int f; > > if (secure) > return (1); > Index: edit.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/edit.c,v > retrieving revision 1.11 > diff -u -p -r1.11 edit.c > --- edit.c 10 May 2014 16:45:23 -0000 1.11 > +++ edit.c 1 Nov 2015 19:19:17 -0000 > @@ -717,7 +717,7 @@ edit_stdin() > public void > cat_file() > { > - register int c; > + int c; > > while ((c = ch_forw_get()) != EOI) > putchr(c); > @@ -735,8 +735,8 @@ cat_file() > use_logfile(filename) > char *filename; > { > - register int exists; > - register int answer; > + int exists; > + int answer; > PARG parg; > > if (ch_getflags() & CH_CANSEEK) > Index: filename.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/filename.c,v > retrieving revision 1.16 > diff -u -p -r1.16 filename.c > --- filename.c 25 Apr 2014 13:38:21 -0000 1.16 > +++ filename.c 1 Nov 2015 19:19:17 -0000 > @@ -265,7 +265,7 @@ dirfile(dirname, filename) > homefile(filename) > char *filename; > { > - register char *pathname; > + char *pathname; > > /* > * Try $HOME/filename. > @@ -316,9 +316,9 @@ homefile(filename) > fexpand(s) > char *s; > { > - register char *fr, *to; > - register int n; > - register char *e; > + char *fr, *to; > + int n; > + char *e; > IFILE ifile; > > #define fchar_ifile(c) \ > @@ -688,9 +688,9 @@ lglob(filename) > * The globbing function returns a single name, and > * is called multiple times to walk thru all names. > */ > - register char *p; > - register int len; > - register int n; > + char *p; > + int len; > + int n; > char *pathname; > char *qpathname; > DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle) > @@ -1012,7 +1012,7 @@ is_dir(filename) > #else > #ifdef _OSK > { > - register int f; > + int f; > > f = open(filename, S_IREAD | S_IFDIR); > if (f >= 0) > @@ -1034,7 +1034,7 @@ is_dir(filename) > bad_file(filename) > char *filename; > { > - register char *m = NULL; > + char *m = NULL; > size_t len; > > filename = shell_unquote(filename); > Index: forwback.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/forwback.c,v > retrieving revision 1.9 > diff -u -p -r1.9 forwback.c > --- forwback.c 25 Apr 2014 13:38:21 -0000 1.9 > +++ forwback.c 1 Nov 2015 19:19:17 -0000 > @@ -118,7 +118,7 @@ squish_check() > */ > public void > forw(n, pos, force, only_last, nblank) > - register int n; > + int n; > POSITION pos; > int force; > int only_last; > @@ -284,7 +284,7 @@ forw(n, pos, force, only_last, nblank) > */ > public void > back(n, pos, force, only_last) > - register int n; > + int n; > POSITION pos; > int force; > int only_last; > Index: ifile.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/ifile.c,v > retrieving revision 1.7 > diff -u -p -r1.7 ifile.c > --- ifile.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ ifile.c 1 Nov 2015 19:19:17 -0000 > @@ -50,7 +50,7 @@ static int ifiles = 0; > > static void > incr_index(p, incr) > - register struct ifile *p; > + struct ifile *p; > int incr; > { > for (; p != &anchor; p = p->h_next) > @@ -107,7 +107,7 @@ new_ifile(filename, prev) > char *filename; > struct ifile *prev; > { > - register struct ifile *p; > + struct ifile *p; > > /* > * Allocate and initialize structure. > @@ -129,7 +129,7 @@ new_ifile(filename, prev) > del_ifile(h) > IFILE h; > { > - register struct ifile *p; > + struct ifile *p; > > if (h == NULL_IFILE) > return; > @@ -153,7 +153,7 @@ del_ifile(h) > next_ifile(h) > IFILE h; > { > - register struct ifile *p; > + struct ifile *p; > > p = (h == NULL_IFILE) ? &anchor : int_ifile(h); > if (p->h_next == &anchor) > @@ -168,7 +168,7 @@ next_ifile(h) > prev_ifile(h) > IFILE h; > { > - register struct ifile *p; > + struct ifile *p; > > p = (h == NULL_IFILE) ? &anchor : int_ifile(h); > if (p->h_prev == &anchor) > @@ -208,7 +208,7 @@ nifile() > find_ifile(filename) > char *filename; > { > - register struct ifile *p; > + struct ifile *p; > > for (p = anchor.h_next; p != &anchor; p = p->h_next) > if (strcmp(filename, p->h_filename) == 0) > @@ -226,7 +226,7 @@ get_ifile(filename, prev) > char *filename; > IFILE prev; > { > - register struct ifile *p; > + struct ifile *p; > > if ((p = find_ifile(filename)) == NULL) > p = new_ifile(filename, int_ifile(prev)); > @@ -334,7 +334,7 @@ set_filestate(ifile, filestate) > public void > if_dump() > { > - register struct ifile *p; > + struct ifile *p; > > for (p = anchor.h_next; p != &anchor; p = p->h_next) > { > Index: input.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/input.c,v > retrieving revision 1.7 > diff -u -p -r1.7 input.c > --- input.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ input.c 1 Nov 2015 19:19:17 -0000 > @@ -47,7 +47,7 @@ forw_line(curr_pos) > { > POSITION base_pos; > POSITION new_pos; > - register int c; > + int c; > int blankline; > int endline; > int backchars; > Index: jump.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/jump.c,v > retrieving revision 1.6 > diff -u -p -r1.6 jump.c > --- jump.c 25 Apr 2014 13:38:21 -0000 1.6 > +++ jump.c 1 Nov 2015 19:19:17 -0000 > @@ -178,7 +178,7 @@ jump_loc(pos, sline) > POSITION pos; > int sline; > { > - register int nline; > + int nline; > POSITION tpos; > POSITION bpos; > > Index: lesskey.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/lesskey.c,v > retrieving revision 1.7 > diff -u -p -r1.7 lesskey.c > --- lesskey.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ lesskey.c 1 Nov 2015 19:19:17 -0000 > @@ -360,9 +360,9 @@ tstr(pp, xlate) > char **pp; > int xlate; > { > - register char *p; > - register char ch; > - register int i; > + char *p; > + char ch; > + int i; > static char buf[10]; > static char tstr_control_k[] = > { SK_SPECIAL_KEY, SK_CONTROL_K, 6, 1, 1, 1, '\0' }; > @@ -473,7 +473,7 @@ tstr(pp, xlate) > */ > public char * > skipsp(s) > - register char *s; > + char *s; > { > while (*s == ' ' || *s == '\t') > s++; > @@ -485,7 +485,7 @@ skipsp(s) > */ > public char * > skipnsp(s) > - register char *s; > + char *s; > { > while (*s != '\0' && *s != ' ' && *s != '\t') > s++; > @@ -500,7 +500,7 @@ skipnsp(s) > clean_line(s) > char *s; > { > - register int i; > + int i; > > s = skipsp(s); > for (i = 0; s[i] != '\n' && s[i] != '\r' && s[i] != '\0'; i++) > Index: line.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/line.c,v > retrieving revision 1.12 > diff -u -p -r1.12 line.c > --- line.c 25 Apr 2014 13:38:21 -0000 1.12 > +++ line.c 1 Nov 2015 19:19:17 -0000 > @@ -158,8 +158,8 @@ prewind() > plinenum(pos) > POSITION pos; > { > - register LINENUM linenum = 0; > - register int i; > + LINENUM linenum = 0; > + int i; > > if (linenums == OPT_ONPLUS) > { > @@ -863,7 +863,7 @@ do_append(ch, rep, pos) > char *rep; > POSITION pos; > { > - register int a; > + int a; > LWCHAR prev_ch; > > a = AT_NORMAL; > @@ -1114,8 +1114,8 @@ set_status_col(c) > */ > public int > gline(i, ap) > - register int i; > - register int *ap; > + int i; > + int *ap; > { > if (is_null_line) > { > @@ -1162,8 +1162,8 @@ forw_raw_line(curr_pos, linep, line_lenp > char **linep; > int *line_lenp; > { > - register int n; > - register int c; > + int n; > + int c; > POSITION new_pos; > > if (curr_pos == NULL_POSITION || ch_seek(curr_pos) || > @@ -1211,8 +1211,8 @@ back_raw_line(curr_pos, linep, line_lenp > char **linep; > int *line_lenp; > { > - register int n; > - register int c; > + int n; > + int c; > POSITION new_pos; > > if (curr_pos == NULL_POSITION || curr_pos <= ch_zero() || > Index: linenum.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/linenum.c,v > retrieving revision 1.7 > diff -u -p -r1.7 linenum.c > --- linenum.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ linenum.c 1 Nov 2015 19:19:17 -0000 > @@ -75,7 +75,7 @@ extern int screen_trashed; > public void > clr_linenum() > { > - register struct linenum_info *p; > + struct linenum_info *p; > > /* > * Put all the entries on the free list. > @@ -102,7 +102,7 @@ clr_linenum() > */ > static void > calcgap(p) > - register struct linenum_info *p; > + struct linenum_info *p; > { > /* > * Don't bother to compute a gap for the anchor. > @@ -125,11 +125,11 @@ add_lnum(linenum, pos) > LINENUM linenum; > POSITION pos; > { > - register struct linenum_info *p; > - register struct linenum_info *new; > - register struct linenum_info *nextp; > - register struct linenum_info *prevp; > - register POSITION mingap; > + struct linenum_info *p; > + struct linenum_info *new; > + struct linenum_info *nextp; > + struct linenum_info *prevp; > + POSITION mingap; > > /* > * Find the proper place in the list for the new one. > @@ -265,8 +265,8 @@ abort_long() > find_linenum(pos) > POSITION pos; > { > - register struct linenum_info *p; > - register LINENUM linenum; > + struct linenum_info *p; > + LINENUM linenum; > POSITION cpos; > > if (!linenums) > @@ -380,7 +380,7 @@ find_linenum(pos) > find_pos(linenum) > LINENUM linenum; > { > - register struct linenum_info *p; > + struct linenum_info *p; > POSITION cpos; > LINENUM clinenum; > > Index: lsystem.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/lsystem.c,v > retrieving revision 1.9 > diff -u -p -r1.9 lsystem.c > --- lsystem.c 25 Apr 2014 13:38:21 -0000 1.9 > +++ lsystem.c 1 Nov 2015 19:19:17 -0000 > @@ -42,10 +42,10 @@ lsystem(cmd, donemsg) > char *cmd; > char *donemsg; > { > - register int inp; > + int inp; > #if HAVE_SHELL > - register char *shell; > - register char *p; > + char *shell; > + char *p; > #endif > IFILE save_ifile; > #if MSDOS_COMPILER && MSDOS_COMPILER!=WIN32C > @@ -289,8 +289,8 @@ pipe_data(cmd, spos, epos) > POSITION spos; > POSITION epos; > { > - register FILE *f; > - register int c; > + FILE *f; > + int c; > extern FILE *popen(); > > /* > Index: main.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/main.c,v > retrieving revision 1.16 > diff -u -p -r1.16 main.c > --- main.c 13 May 2014 02:34:58 -0000 1.16 > +++ main.c 1 Nov 2015 19:19:17 -0000 > @@ -303,7 +303,7 @@ main(argc, argv) > save(s) > char *s; > { > - register char *p; > + char *p; > size_t len = strlen(s) + 1; > > p = (char *) ecalloc(len, sizeof(char)); > @@ -320,7 +320,7 @@ ecalloc(count, size) > int count; > unsigned int size; > { > - register VOID_POINTER p; > + VOID_POINTER p; > > p = (VOID_POINTER) calloc(count, size); > if (p != NULL) > @@ -336,7 +336,7 @@ ecalloc(count, size) > */ > public char * > skipsp(s) > - register char *s; > + char *s; > { > while (*s == ' ' || *s == '\t') > s++; > @@ -355,9 +355,9 @@ sprefix(ps, s, uppercase) > char *s; > int uppercase; > { > - register int c; > - register int sc; > - register int len = 0; > + int c; > + int sc; > + int len = 0; > > for ( ; *s != '\0'; s++, ps++) > { > Index: mark.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/mark.c,v > retrieving revision 1.8 > diff -u -p -r1.8 mark.c > --- mark.c 25 Apr 2014 13:38:21 -0000 1.8 > +++ mark.c 1 Nov 2015 19:19:17 -0000 > @@ -69,7 +69,7 @@ getumark(c) > getmark(c) > int c; > { > - register struct mark *m; > + struct mark *m; > static struct mark sm; > > switch (c) > @@ -147,7 +147,7 @@ badmark(c) > setmark(c) > int c; > { > - register struct mark *m; > + struct mark *m; > struct scrpos scrpos; > > m = getumark(c); > @@ -182,7 +182,7 @@ lastmark() > gomark(c) > int c; > { > - register struct mark *m; > + struct mark *m; > struct scrpos scrpos; > > m = getmark(c); > @@ -231,7 +231,7 @@ gomark(c) > markpos(c) > int c; > { > - register struct mark *m; > + struct mark *m; > > m = getmark(c); > if (m == NULL) > Index: optfunc.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/optfunc.c,v > retrieving revision 1.9 > diff -u -p -r1.9 optfunc.c > --- optfunc.c 25 Apr 2014 13:38:21 -0000 1.9 > +++ optfunc.c 1 Nov 2015 19:19:17 -0000 > @@ -356,7 +356,7 @@ opt__T(type, s) > public void > opt_p(type, s) > int type; > - register char *s; > + char *s; > { > switch (type) > { > @@ -387,9 +387,9 @@ opt_p(type, s) > public void > opt__P(type, s) > int type; > - register char *s; > + char *s; > { > - register char **proto; > + char **proto; > PARG parg; > > switch (type) > @@ -606,7 +606,7 @@ opt_D(type, s) > public void > opt_x(type, s) > int type; > - register char *s; > + char *s; > { > extern int tabstops[]; > extern int ntabstops; > @@ -666,7 +666,7 @@ opt_x(type, s) > public void > opt_quote(type, s) > int type; > - register char *s; > + char *s; > { > char buf[3]; > PARG parg; > Index: option.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/option.c,v > retrieving revision 1.9 > diff -u -p -r1.9 option.c > --- option.c 25 Apr 2014 18:07:41 -0000 1.9 > +++ option.c 1 Nov 2015 19:19:17 -0000 > @@ -69,8 +69,8 @@ propt(c) > scan_option(s) > char *s; > { > - register struct loption *o; > - register int optc; > + struct loption *o; > + int optc; > char *optname; > char *printopt; > char *str; > @@ -307,7 +307,7 @@ toggle_option(o, lower, s, how_toggle) > char *s; > int how_toggle; > { > - register int num; > + int num; > int no_prompt; > int err; > PARG parg; > @@ -570,8 +570,8 @@ optstring(s, p_str, printopt, validchars > char *printopt; > char *validchars; > { > - register char *p; > - register char *out; > + char *p; > + char *out; > > if (*s == '\0') > { > @@ -634,9 +634,9 @@ getnum(sp, printopt, errp) > char *printopt; > int *errp; > { > - register char *s; > - register int n; > - register int neg; > + char *s; > + int n; > + int neg; > > s = skipsp(*sp); > neg = FALSE; > @@ -671,7 +671,7 @@ getfraction(sp, printopt, errp) > char *printopt; > int *errp; > { > - register char *s; > + char *s; > long frac = 0; > int fraclen = 0; > > Index: opttbl.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/opttbl.c,v > retrieving revision 1.13 > diff -u -p -r1.13 opttbl.c > --- opttbl.c 29 Apr 2014 12:11:25 -0000 1.13 > +++ opttbl.c 1 Nov 2015 19:19:17 -0000 > @@ -525,7 +525,7 @@ static struct loption option[] = > public void > init_option() > { > - register struct loption *o; > + struct loption *o; > char *p; > > p = lgetenv("LESS_IS_MORE"); > @@ -551,7 +551,7 @@ init_option() > findopt(c) > int c; > { > - register struct loption *o; > + struct loption *o; > > for (o = option; o->oletter != '\0'; o++) > { > @@ -593,9 +593,9 @@ findopt_name(p_optname, p_oname, p_err) > int *p_err; > { > char *optname = *p_optname; > - register struct loption *o; > - register struct optname *oname; > - register int len; > + struct loption *o; > + struct optname *oname; > + int len; > int uppercase; > struct loption *maxo = NULL; > struct optname *maxoname = NULL; > Index: os.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/os.c,v > retrieving revision 1.11 > diff -u -p -r1.11 os.c > --- os.c 25 Apr 2014 13:38:21 -0000 1.11 > +++ os.c 1 Nov 2015 19:19:17 -0000 > @@ -49,7 +49,7 @@ iread(fd, buf, len) > char *buf; > unsigned int len; > { > - register int n; > + int n; > > start: > #if MSDOS_COMPILER==WIN32C > @@ -176,8 +176,8 @@ strerror(err) > errno_message(filename) > char *filename; > { > - register char *p; > - register char *m; > + char *p; > + char *m; > size_t len; > #if HAVE_ERRNO > #if MUST_DEFINE_ERRNO > Index: output.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/output.c,v > retrieving revision 1.9 > diff -u -p -r1.9 output.c > --- output.c 25 Apr 2014 13:38:21 -0000 1.9 > +++ output.c 1 Nov 2015 19:19:17 -0000 > @@ -45,8 +45,8 @@ extern int bl_fg_color, bl_bg_color; > public void > put_line() > { > - register int c; > - register int i; > + int c; > + int i; > int a; > > if (ABORT_SIGS()) > @@ -95,8 +95,8 @@ static char *ob = obuf; > public void > flush() > { > - register int n; > - register int fd; > + int n; > + int fd; > ssize_t nwritten; > > n = ob - obuf; > @@ -387,7 +387,7 @@ putchr(c) > */ > public void > putstr(s) > - register char *s; > + char *s; > { > while (*s != '\0') > putchr(*s++); > @@ -405,7 +405,7 @@ void funcname(num, buf, len) \ > { \ > int neg = (num < 0); \ > char tbuf[INT_STRLEN_BOUND(num)+2]; \ > - register char *s = tbuf + sizeof(tbuf); \ > + char *s = tbuf + sizeof(tbuf); \ > if (neg) num = -num; \ > *--s = '\0'; \ > do { \ > @@ -453,11 +453,11 @@ iprint_linenum(num) > */ > static int > less_printf(fmt, parg) > - register char *fmt; > + char *fmt; > PARG *parg; > { > - register char *s; > - register int col; > + char *s; > + int col; > > col = 0; > while (*fmt != '\0') > @@ -597,7 +597,7 @@ query(fmt, parg) > char *fmt; > PARG *parg; > { > - register int c; > + int c; > int col = 0; > > if (any_display && is_tty) > Index: pattern.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/pattern.c,v > retrieving revision 1.5 > diff -u -p -r1.5 pattern.c > --- pattern.c 28 May 2014 11:39:15 -0000 1.5 > +++ pattern.c 1 Nov 2015 19:19:17 -0000 > @@ -222,9 +222,9 @@ match(pattern, pattern_len, buf, buf_len > int buf_len; > char **pfound, **pend; > { > - register char *pp, *lp; > - register char *pattern_end = pattern + pattern_len; > - register char *buf_end = buf + buf_len; > + char *pp, *lp; > + char *pattern_end = pattern + pattern_len; > + char *buf_end = buf + buf_len; > > for ( ; buf < buf_end; buf++) > { > Index: position.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/position.c,v > retrieving revision 1.7 > diff -u -p -r1.7 position.c > --- position.c 25 Apr 2014 13:38:21 -0000 1.7 > +++ position.c 1 Nov 2015 19:19:17 -0000 > @@ -60,7 +60,7 @@ position(where) > add_forw_pos(pos) > POSITION pos; > { > - register int i; > + int i; > > /* > * Scroll the position table up. > @@ -77,7 +77,7 @@ add_forw_pos(pos) > add_back_pos(pos) > POSITION pos; > { > - register int i; > + int i; > > /* > * Scroll the position table down. > @@ -93,7 +93,7 @@ add_back_pos(pos) > public void > pos_clear() > { > - register int i; > + int i; > > for (i = 0; i < sc_height; i++) > table[i] = NULL_POSITION; > @@ -135,7 +135,7 @@ pos_init() > onscreen(pos) > POSITION pos; > { > - register int i; > + int i; > > if (pos < table[0]) > return (-1); > @@ -159,7 +159,7 @@ empty_lines(s, e) > int s; > int e; > { > - register int i; > + int i; > > for (i = s; i <= e; i++) > if (table[i] != NULL_POSITION && table[i] != 0) > @@ -179,7 +179,7 @@ empty_lines(s, e) > get_scrpos(scrpos) > struct scrpos *scrpos; > { > - register int i; > + int i; > > /* > * Find the first line on the screen which has something on it, > Index: prompt.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/prompt.c,v > retrieving revision 1.13 > diff -u -p -r1.13 prompt.c > --- prompt.c 25 Apr 2014 13:38:21 -0000 1.13 > +++ prompt.c 1 Nov 2015 19:19:17 -0000 > @@ -392,9 +392,9 @@ protochar(c, where, iseditproto) > */ > static constant char * > skipcond(p) > - register constant char *p; > + constant char *p; > { > - register int iflevel; > + int iflevel; > > /* > * We came in here after processing a ? or :, > @@ -477,8 +477,8 @@ pr_expand(proto, maxwidth) > constant char *proto; > int maxwidth; > { > - register constant char *p; > - register int c; > + constant char *p; > + int c; > int where; > > mp = message; > Index: regexp.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/regexp.c,v > retrieving revision 1.8 > diff -u -p -r1.8 regexp.c > --- regexp.c 22 Jan 2014 09:41:54 -0000 1.8 > +++ regexp.c 1 Nov 2015 19:19:17 -0000 > @@ -210,10 +210,10 @@ regexp * > regcomp(exp) > char *exp; > { > - register regexp *r; > - register char *scan; > - register char *longest; > - register int len; > + regexp *r; > + char *scan; > + char *longest; > + int len; > int flags; > > if (exp == NULL) > @@ -300,10 +300,10 @@ reg(paren, flagp) > int paren; /* Parenthesized? */ > int *flagp; > { > - register char *ret; > - register char *br; > - register char *ender; > - register int parno = 0; > + char *ret; > + char *br; > + char *ender; > + int parno = 0; > int flags; > > *flagp = HASWIDTH; /* Tentatively. */ > @@ -371,9 +371,9 @@ static char * > regbranch(flagp) > int *flagp; > { > - register char *ret; > - register char *chain; > - register char *latest; > + char *ret; > + char *chain; > + char *latest; > int flags; > > *flagp = WORST; /* Tentatively. */ > @@ -410,9 +410,9 @@ static char * > regpiece(flagp) > int *flagp; > { > - register char *ret; > - register char op; > - register char *next; > + char *ret; > + char op; > + char *next; > int flags; > > ret = regatom(&flags); > @@ -474,7 +474,7 @@ static char * > regatom(flagp) > int *flagp; > { > - register char *ret; > + char *ret; > int flags; > > *flagp = WORST; /* Tentatively. */ > @@ -491,8 +491,8 @@ int *flagp; > *flagp |= HASWIDTH|SIMPLE; > break; > case '[': { > - register int clss; > - register int classend; > + int clss; > + int classend; > > if (*regparse == '^') { /* Complement of range. */ > ret = regnode(ANYBUT); > @@ -552,8 +552,8 @@ int *flagp; > *flagp |= HASWIDTH|SIMPLE; > break; > default: { > - register int len; > - register char ender; > + int len; > + char ender; > > regparse--; > len = strcspn(regparse, META); > @@ -585,8 +585,8 @@ static char * /* Location. */ > regnode(op) > char op; > { > - register char *ret; > - register char *ptr; > + char *ret; > + char *ptr; > > ret = regcode; > if (ret == ®dummy) { > @@ -626,9 +626,9 @@ reginsert(op, opnd) > char op; > char *opnd; > { > - register char *src; > - register char *dst; > - register char *place; > + char *src; > + char *dst; > + char *place; > > if (regcode == ®dummy) { > regsize += 3; > @@ -655,9 +655,9 @@ regtail(p, val) > char *p; > char *val; > { > - register char *scan; > - register char *temp; > - register int offset; > + char *scan; > + char *temp; > + int offset; > > if (p == ®dummy) > return; > @@ -723,11 +723,11 @@ STATIC char *regprop(); > */ > int > regexec2(prog, string, notbol) > -register regexp *prog; > -register char *string; > +regexp *prog; > +char *string; > int notbol; > { > - register char *s; > + char *s; > > /* Be paranoid... */ > if (prog == NULL || string == NULL) { > @@ -785,8 +785,8 @@ int notbol; > > int > regexec(prog, string) > -register regexp *prog; > -register char *string; > +regexp *prog; > +char *string; > { > return regexec2(prog, string, 0); > } > @@ -799,9 +799,9 @@ regtry(prog, string) > regexp *prog; > char *string; > { > - register int i; > - register char **sp; > - register char **ep; > + int i; > + char **sp; > + char **ep; > > reginput = string; > regstartp = prog->startp; > @@ -835,7 +835,7 @@ static int /* 0 failure, 1 success > */ > regmatch(prog) > char *prog; > { > - register char *scan; /* Current node. */ > + char *scan; /* Current node. */ > char *next; /* Next node. */ > > scan = prog; > @@ -865,8 +865,8 @@ char *prog; > reginput++; > break; > case EXACTLY: { > - register int len; > - register char *opnd; > + int len; > + char *opnd; > > opnd = OPERAND(scan); > /* Inline the first character, for speed. */ > @@ -901,8 +901,8 @@ char *prog; > case OPEN+7: > case OPEN+8: > case OPEN+9: { > - register int no; > - register char *save; > + int no; > + char *save; > > no = OP(scan) - OPEN; > save = reginput; > @@ -930,8 +930,8 @@ char *prog; > case CLOSE+7: > case CLOSE+8: > case CLOSE+9: { > - register int no; > - register char *save; > + int no; > + char *save; > > no = OP(scan) - CLOSE; > save = reginput; > @@ -951,7 +951,7 @@ char *prog; > /* NOTREACHED */ > break; > case BRANCH: { > - register char *save; > + char *save; > > if (OP(next) != BRANCH) /* No choice. */ > next = OPERAND(scan); /* Avoid > recursion. */ > @@ -971,10 +971,10 @@ char *prog; > break; > case STAR: > case PLUS: { > - register char nextch; > - register int no; > - register char *save; > - register int min; > + char nextch; > + int no; > + char *save; > + int min; > > /* > * Lookahead to avoid useless match attempts > @@ -1028,9 +1028,9 @@ static int > regrepeat(p) > char *p; > { > - register int count = 0; > - register char *scan; > - register char *opnd; > + int count = 0; > + char *scan; > + char *opnd; > > scan = reginput; > opnd = OPERAND(p); > @@ -1072,9 +1072,9 @@ char *p; > */ > static char * > regnext(p) > -register char *p; > +char *p; > { > - register int offset; > + int offset; > > if (p == ®dummy) > return(NULL); > @@ -1100,9 +1100,9 @@ void > regdump(r) > regexp *r; > { > - register char *s; > - register char op = EXACTLY; /* Arbitrary non-END op. */ > - register char *next; > + char *s; > + char op = EXACTLY; /* Arbitrary non-END op. */ > + char *next; > > > s = r->program + 1; > @@ -1143,7 +1143,7 @@ static char * > regprop(op) > char *op; > { > - register char *p; > + char *p; > static char buf[50]; > > (void) strlcpy(buf, ":", sizeof(buf)); > @@ -1238,9 +1238,9 @@ strcspn(s1, s2) > char *s1; > char *s2; > { > - register char *scan1; > - register char *scan2; > - register int count; > + char *scan1; > + char *scan2; > + int count; > > count = 0; > for (scan1 = s1; *scan1 != '\0'; scan1++) { > Index: screen.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/screen.c,v > retrieving revision 1.17 > diff -u -p -r1.17 screen.c > --- screen.c 25 Apr 2014 13:38:21 -0000 1.17 > +++ screen.c 1 Nov 2015 19:19:17 -0000 > @@ -695,7 +695,7 @@ ltgetstr(capname, pp) > public void > scrsize() > { > - register char *s; > + char *s; > int sys_height; > int sys_width; > #if !MSDOS_COMPILER > @@ -1119,7 +1119,7 @@ get_term() > #else /* !MSDOS_COMPILER */ > > char *sp; > - register char *t1, *t2; > + char *t1, *t2; > char *term; > char termbuf[TERMBUF_SIZE]; > > @@ -1945,7 +1945,7 @@ create_flash() > } > #else > #if MSDOS_COMPILER==BORLANDC > - register int n; > + int n; > > whitescreen = (unsigned short *) > malloc(sc_width * sc_height * sizeof(short)); > @@ -1955,7 +1955,7 @@ create_flash() > whitescreen[n] = 0x7020; > #else > #if MSDOS_COMPILER==WIN32C > - register int n; > + int n; > > whitescreen = (WORD *) > malloc(sc_height * sc_width * sizeof(WORD)); > Index: signal.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/signal.c,v > retrieving revision 1.9 > diff -u -p -r1.9 signal.c > --- signal.c 25 Apr 2014 13:38:21 -0000 1.9 > +++ signal.c 1 Nov 2015 19:19:17 -0000 > @@ -176,7 +176,7 @@ init_signals(on) > public void > psignals() > { > - register int tsignals; > + int tsignals; > > if ((tsignals = sigs) == 0) > return; > Index: tags.c > =================================================================== > RCS file: /cvs/src/usr.bin/less/tags.c,v > retrieving revision 1.11 > diff -u -p -r1.11 tags.c > --- tags.c 25 Apr 2014 13:38:21 -0000 1.11 > +++ tags.c 1 Nov 2015 19:19:17 -0000 > @@ -89,7 +89,7 @@ static struct tag *curtag; > public void > cleantags() > { > - register struct tag *tp; > + struct tag *tp; > > /* > * Delete any existing tag list. > @@ -116,7 +116,7 @@ maketagent(name, file, linenum, pattern, > char *pattern; > int endline; > { > - register struct tag *tp; > + struct tag *tp; > > tp = (struct tag *) ecalloc(sizeof(struct tag), 1); > tp->tag_file = save(file); > @@ -165,7 +165,7 @@ gettagtype() > */ > public void > findtag(tag) > - register char *tag; > + char *tag; > { > int type = gettagtype(); > enum tag_result result; > @@ -261,11 +261,11 @@ curr_tag() > */ > static enum tag_result > findctag(tag) > - register char *tag; > + char *tag; > { > char *p; > - register FILE *f; > - register int taglen; > + FILE *f; > + int taglen; > LINENUM taglinenum; > char *tagfile; > char *tagpattern; >