remove use of register keyword in C files

C compilers have been ignoring it for the last decade

Change-Id: I42918263121dd189bab9d27077798b779b9e8da1
Reviewed-on: https://gerrit.libreoffice.org/9873
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 107 insertions, 107 deletions

diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index 8c03af548db6..e0ae7f532062 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -230,7 +230,7 @@ void InitCpp1()
 
 int MAIN(int argc, char** argv)
 {
-        register int    i;
+        int    i;
         char **useargv, **pfargv;
 
 
@@ -383,8 +383,8 @@ void cppmain()
  * file.
  */
 {
-        register int            c;              /* Current character    */
-        register int            counter;        /* newlines and spaces  */
+        int            c;              /* Current character    */
+        int            counter;        /* newlines and spaces  */
 
         /*
          * Explicitly output a #line at the start of cpp output so
@@ -569,7 +569,7 @@ void sharp()
  * Output a line number line.
  */
 {
-        register char           *name;
+        char           *name;
 
         if (keepcomments)                       /* Make sure # comes on */
             PUTCHAR('\n');                      /* a fresh, new line.   */
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index b7224ac6c05f..810d82371b4a 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -76,10 +76,10 @@ control(int counter)
  * the end of the previous line if cpp is invoked with the -C option.
  */
 {
-        register int            c;
-        register char           *tp;
-        register int            hash;
-        char                    *ep;
+        int            c;
+        char           *tp;
+        int            hash;
+        char           *ep;
 
         c = skipws();
         if (c == '\n' || c == EOF_CHAR)
@@ -319,8 +319,8 @@ void doif(int hash)
  * suppresses unnecessary warnings.
  */
 {
-        register int            c;
-        register int            found;
+        int            c;
+        int            found;
 
         if ((c = skipws()) == '\n' || c == EOF_CHAR) {
             unget();
@@ -370,8 +370,8 @@ void doinclude()
  * This restriction is unnecessary and not implemented.
  */
 {
-        register int            c;
-        register int            delim;
+        int            c;
+        int            delim;
 #if HOST == SYS_VMS
         char                    def_filename[NAM$C_MAXRSS + 1];
 #endif
@@ -434,7 +434,7 @@ openinclude(char* filename, int searchlocal)
  * if openinclude() fails.  No error message is printed.
  */
 {
-        register char           **incptr;
+        char           **incptr;
 #if HOST == SYS_VMS
 #if NFWORK < (NAM$C_MAXRSS + 1)
     << error, NFWORK is not greater than NAM$C_MAXRSS >>
@@ -508,7 +508,7 @@ hasdirectory(char* source, char* result)
  */
 {
 #if HOST == SYS_UNIX
-        register char           *tp;
+        char           *tp;
 
         if ((tp = strrchr(source, '/')) == NULL)
             return (FALSE);
@@ -529,7 +529,7 @@ hasdirectory(char* source, char* result)
         /*
          * Random DEC operating system (RSX, RT11, RSTS/E)
          */
-        register char           *tp;
+        char           *tp;
 
         if ((tp = strrchr(source, ']')) == NULL
          && (tp = strrchr(source, ':')) == NULL)
@@ -569,7 +569,7 @@ char            *result;        /* Size is at least NAM$C_MAXRSS + 1    */
         struct FAB      fab = cc$rms_fab;       /* File access block    */
         struct NAM      nam = cc$rms_nam;       /* File name block      */
         char            fullname[NAM$C_MAXRSS + 1];
-        register char   *rp;                    /* Result pointer       */
+        char            *rp;                    /* Result pointer       */
 
         fab.fab$l_nam = &nam;                   /* fab -> nam           */
         fab.fab$l_fna = source;                 /* Source filename      */
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index 81a5ac898a54..287b2a583d88 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -48,7 +48,7 @@ openfile(char* filename)
  * This is called only from openfile() above.
  */
 {
-        register FILE           *fp;
+        FILE           *fp;
 
         if ((fp = fopen(filename, "r")) == NULL) {
 #if OSL_DEBUG_LEVEL > 1
@@ -74,7 +74,7 @@ void addfile(FILE* fp, char* filename)
  * to setup a macro replacement.)
  */
 {
-        register FILEINFO       *file;
+        FILEINFO       *file;
         extern FILEINFO         *getfile( int, char * );
         file = getfile(NBUFF, filename);
         file->fp = fp;                  /* Better remember FILE *       */
@@ -204,15 +204,15 @@ dooptions(int argc, char** argv)
  * It is called only at cpp startup.
  */
 {
-        register char           *ap;
-        register DEFBUF         *dp;
-        register int            c;
-        int                     i, j;
-        char                    *arg;
-        SIZES                   *sizp;          /* For -S               */
-        int                     size;           /* For -S               */
-        int                     isdatum;        /* FALSE for -S*        */
-        int                     endtest;        /* For -S               */
+        char           *ap;
+        DEFBUF         *dp;
+        int            c;
+        int            i, j;
+        char           *arg;
+        SIZES          *sizp;          /* For -S               */
+        int            size;           /* For -S               */
+        int            isdatum;        /* FALSE for -S*        */
+        int            endtest;        /* For -S               */
 
         for (i = j = 1; i < argc; i++) {
             arg = ap = argv[i];
@@ -434,11 +434,11 @@ void initdefines()
  * __LINE__, __FILE__, and __DATE__ are always present.
  */
 {
-        register char           **pp;
-        register char           *tp;
-        register DEFBUF         *dp;
-        int                     i;
-        time_t                  tvec;
+        char           **pp;
+        char           *tp;
+        DEFBUF         *dp;
+        int            i;
+        time_t         tvec;
 
 #if !defined( WNT ) && !defined(G3)
         extern char             *ctime(time_t const *);
@@ -515,7 +515,7 @@ char            **argv;
  *      }
  */
 {
-        register char           *ap;    /* Argument pointer     */
+        char                    *ap;    /* Argument pointer     */
         int                     i;      /* argv[] index         */
         int                     j;      /* Output index         */
         int                     file;   /* File_descriptor      */
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index d5af024bd717..6473669e7b63 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -82,8 +82,8 @@ void dodefine()
  *              in a manner analogous to textput().
  */
 {
-        register int            c;
-        register DEFBUF         *dp;            /* -> new definition    */
+        int                     c;
+        DEFBUF                  *dp;            /* -> new definition    */
         int                     isredefine;     /* TRUE if redefined    */
         char                    *old = 0;       /* Remember redefined   */
 
@@ -239,8 +239,8 @@ void checkparm(int c, DEFBUF* dp)
  * looping if someone writes "#define foo foo".
  */
 {
-        register int            i;
-        register char           *cp;
+        int            i;
+        char           *cp;
 
         scanid(c);                              /* Get parm to token[]  */
         for (i = 0; i < nargs; i++) {           /* For each argument    */
@@ -261,7 +261,7 @@ void checkparm(int c, DEFBUF* dp)
 #if STRING_FORMAL
 void stparmscan(delim, dp)
 int             delim;
-register DEFBUF *dp;
+DEFBUF          *dp;
 /*
  * Scan the string (starting with the given delimiter).
  * The token is replaced if it is the only text in this string or
@@ -269,7 +269,7 @@ register DEFBUF *dp;
  * Note that scanstring() has approved of the string.
  */
 {
-        register int            c;
+        int            c;
 
         /*
          * Warning -- this code hasn't been tested for a while.
@@ -301,8 +301,8 @@ void stparmscan(int delim)
  * Normal string parameter scan.
  */
 {
-        register char           *wp;
-        register int            i;
+        char           *wp;
+        int            i;
 
         wp = workp;                     /* Here's where it starts       */
         if (!scanstring(delim, save))
@@ -336,7 +336,7 @@ void doundef()
  * Called from the #control processor.
  */
 {
-        register int            c;
+        int            c;
 
         if (type[(c = skipws())] != LET)
             cerror("Illegal #undef argument", NULLST);
@@ -355,7 +355,7 @@ void textput(char* text)
  * Put the string in the parm[] buffer.
  */
 {
-        register int    size;
+        int    size;
 
         size = strlen(text) + 1;
         if ((parmp + size) >= &parm[NPARMWORK])
@@ -395,8 +395,8 @@ void expand(DEFBUF* tokenp)
  * off the end of the macro line, it will dismiss the macro itself.)
  */
 {
-        register int            c;
-        register FILEINFO       *file;
+        int            c;
+        FILEINFO       *file;
     extern FILEINFO     *getfile(int, char *);
 
 #if OSL_DEBUG_LEVEL > 1
@@ -485,8 +485,8 @@ expcollect()
  * Collect the actual parameters for this macro.  TRUE if ok.
  */
 {
-        register int    c;
-        register int    paren;                  /* For embedded ()'s    */
+        int    c;
+        int    paren;                  /* For embedded ()'s    */
         for (;;) {
             paren = 0;                          /* Collect next arg.    */
             while ((c = skipws()) == '\n')      /* Skip over whitespace */
@@ -546,9 +546,9 @@ void expstuff(DEFBUF* tokenp)
  * Stuff the macro body, replacing formal parameters by actual parameters.
  */
 {
-        register int    c;                      /* Current character    */
-        register char   *inp;                   /* -> repl string       */
-        register char   *defp;                  /* -> macro output buff */
+        int             c;                      /* Current character    */
+        char            *inp;                   /* -> repl string       */
+        char            *defp;                  /* -> macro output buff */
         int             size;                   /* Actual parm. size    */
         char            *defend;                /* -> output buff end   */
         int             string_magic;           /* String formal hack   */
@@ -612,7 +612,7 @@ void dumpparm(char* why)
  * Dump parameter list.
  */
 {
-        register int    i;
+        int    i;
 
     fprintf( pCppOut, "dump of %d parameters (%" SAL_PRI_SIZET "u bytes total) %s\n",
             nargs, parmp - parm, why);
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 14adf4fcec97..4b09f60d453c 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -90,7 +90,7 @@ static int  evalue;         /* Current value from evallex() */
 #ifdef  nomacargs
 FILE_LOCAL int
 isbinary(op)
-register int    op;
+int    op;
 {
     return (op >= FIRST_BINOP && op <= LAST_BINOP);
 }
@@ -209,9 +209,9 @@ eval()
  * if a syntax error is detected.
  */
 {
-    register int    op;     /* Current operator     */
-    register int    *valp;      /* -> value vector      */
-    register OPTAB  *opp;       /* Operator stack       */
+    int    op;     /* Current operator     */
+    int    *valp;      /* -> value vector      */
+    OPTAB  *opp;       /* Operator stack       */
     int     prec;       /* Op precedence        */
     int     binop;      /* Set if binary op. needed */
     int     op1;        /* Operand from stack       */
@@ -371,7 +371,7 @@ evallex(int skip)
  * evalnum  called to evaluate numbers.
  */
 {
-    register int    c, c1, t;
+    int    c, c1, t;
 
 again:  do {                    /* Collect the token    */
         c = skipws();
@@ -488,11 +488,11 @@ dosizeof()
  *  OP_FAIL     bad parse or something.
  */
 {
-    register int    c;
-    register TYPES  *tp;
-    register SIZES  *sizp;
-    register short  *testp;
-    short       typecode;
+    int    c;
+    TYPES  *tp;
+    SIZES  *sizp;
+    short  *testp;
+    short  typecode;
 
     if ((c = skipws()) != '(')
         goto nogood;
@@ -609,9 +609,9 @@ evalnum(int c)
  * the unsigned suffix, but only returns a signed int value.
  */
 {
-    register int    value;
-    register int    base;
-    register int    c1;
+    int    value;
+    int    base;
+    int    c1;
 
     if (c != '0')
         base = 10;
@@ -650,9 +650,9 @@ evalchar(int skip)
  * Get a character constant
  */
 {
-    register int    c;
-    register int    value;
-    register int    count;
+    int    c;
+    int    value;
+    int    count;
 
     instring = TRUE;
     if ((c = cget()) == '\\') {
@@ -754,7 +754,7 @@ evaleval(int* valp, int op, int skip)
  * evaleval() returns the new pointer to the top of the value stack.
  */
 {
-    register int    v1, v2 = 0;
+    int    v1, v2 = 0;
 
     if (isbinary(op))
         v2 = *--valp;
@@ -882,10 +882,10 @@ evaleval(int* valp, int op, int skip)
 
 #ifdef  DEBUG_EVAL
 dumpstack(opstack, opp, value, valp)
-OPTAB       opstack[NEXP];  /* Operand stack        */
-register OPTAB  *opp;       /* Operator stack       */
+OPTAB   opstack[NEXP];  /* Operand stack        */
+OPTAB  *opp;            /* Operator stack       */
 int     value[NEXP];    /* Value stack          */
-register int    *valp;      /* -> value vector      */
+int    *valp;           /* -> value vector      */
 {
     fprintf( pCppOut, "index op prec skip name -- op stack at %s", infile->bptr);
     while (opp > opstack) {
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index 49d12dd7e192..75909647dc39 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -194,7 +194,7 @@ void skipnl()
  * Skip to the end of the current input line.
  */
 {
-        register int            c;
+        int            c;
 
         do {                            /* Skip to newline      */
             c = get();
@@ -207,7 +207,7 @@ skipws()
  * Skip over whitespace
  */
 {
-        register int            c;
+        int            c;
 
         do {                            /* Skip whitespace      */
             c = get();
@@ -226,7 +226,7 @@ void scanid(int c)
  * Change one, change both.
  */
 {
-        register char   *bp;
+        char   *bp;
 
         if (c == DEF_MAGIC)                     /* Eat the magic token  */
             c = get();                          /* undefiner.           */
@@ -249,7 +249,7 @@ macroid(int c)
  * Else, return the character.  If type[c] is a LET, the token is in token.
  */
 {
-        register DEFBUF *dp;
+        DEFBUF *dp;
 
         if (infile != NULL && infile->fp != NULL)
             recursion = 0;
@@ -270,8 +270,8 @@ catenate()
  * and return FALSE.
  */
 {
-        register int            c;
-        register char           *token1;
+        int            c;
+        char           *token1;
 
 #if OK_CONCAT
         if (get() != TOK_SEP) {                 /* Token concatenation  */
@@ -340,7 +340,7 @@ void         (*outfun)() /* BP */
  * TRUE if ok, FALSE if error.
  */
 {
-        register int            c;
+        int            c;
 
         instring = TRUE;                /* Don't strip comments         */
         (*outfun)(delim);
@@ -367,9 +367,9 @@ void         (*outfun)() /* BP */
 
 void scannumber(int c,
 #ifndef _NO_PROTO
-register void    (*outfun)( int )  /* BP */    /* Output/store func    */
+void    (*outfun)( int )  /* BP */    /* Output/store func    */
 #else
-register void    (*outfun)() /* BP */
+void    (*outfun)() /* BP */
 #endif
 )
 /*
@@ -377,7 +377,7 @@ register void    (*outfun)() /* BP */
  * Algorithm from Dave Conroy's Decus C.
  */
 {
-        register int    radix;                  /* 8, 10, or 16         */
+        int             radix;                  /* 8, 10, or 16         */
         int             expseen;                /* 'e' seen in floater  */
         int             signseen;               /* '+' or '-' seen      */
         int             octal89;                /* For bad octal test   */
@@ -510,7 +510,7 @@ savestring(char* text)
  * Store a string into free memory.
  */
 {
-        register char   *result;
+        char   *result;
 
         result = getmem(strlen(text) + 1);
         strcpy(result, text);
@@ -523,8 +523,8 @@ getfile(int bufsize, char* name)
  * Common FILEINFO buffer initialization for a new file or macro.
  */
 {
-        register FILEINFO       *file;
-        register int            size;
+        FILEINFO       *file;
+        int            size;
 
         size = strlen(name);                    /* File/macro name      */
         file = (FILEINFO *) getmem(sizeof (FILEINFO) + bufsize + size);
@@ -549,7 +549,7 @@ getmem(int size)
  * Get a block of free memory.
  */
 {
-        register char   *result;
+        char   *result;
 
         if ((result = malloc((unsigned) size)) == NULL)
             cfatal("Out of memory", NULLST);
@@ -563,9 +563,9 @@ lookid(int c)
  * If found, returns the table pointer;  Else returns NULL.
  */
 {
-        register int            nhash;
-        register DEFBUF         *dp;
-        register char           *np;
+        int                     nhash;
+        DEFBUF                  *dp;
+        char                    *np;
         int                     temp = 0;
         int                     isrecurse;      /* For #define foo foo  */
 
@@ -604,12 +604,12 @@ defendel(char* name, int delete)
  * Returns NULL if the symbol wasn't defined (delete = TRUE).
  */
 {
-        register DEFBUF         *dp;
-        register DEFBUF         **prevp;
-        register char           *np;
-        int                     nhash;
-        int                     temp;
-        int                     size;
+        DEFBUF         *dp;
+        DEFBUF         **prevp;
+        char           *np;
+        int            nhash;
+        int            temp;
+        int            size;
 
         for (nhash = 0, np = name; *np != EOS;)
             nhash += *np++;
@@ -648,8 +648,8 @@ defendel(char* name, int delete)
 
 void dumpdef(char *why)
 {
-        register DEFBUF         *dp;
-        register DEFBUF         **syp;
+        DEFBUF         *dp;
+        DEFBUF         **syp;
         FILE *pRememberOut = NULL;
 
         if ( bDumpDefs )    /*ER */
@@ -673,10 +673,10 @@ void dumpdef(char *why)
         }
 }
 
-void dumpadef(char *why, register DEFBUF *dp)
+void dumpadef(char *why, DEFBUF *dp)
 {
-        register char           *cp;
-        register int            c;
+        char           *cp;
+        int            c;
         FILE *pRememberOut = NULL;
 
 /*ER dump #define's to pDefOut */
@@ -775,9 +775,9 @@ get()
  * Handle end of file from #include files.
  */
 {
-        register int            c;
-        register FILEINFO       *file;
-        register int            popped;         /* Recursion fixup      */
+        int            c;
+        FILEINFO       *file;
+        int            popped;         /* Recursion fixup      */
 
         popped = 0;
 get_from_file:
@@ -1004,7 +1004,7 @@ void unget()
  * be ungotten.  If you need to unget more, call ungetstring().
  */
 {
-        register FILEINFO       *file;
+        FILEINFO       *file;
 
         if ((file = infile) == NULL)
             return;                     /* Unget after EOF              */
@@ -1020,7 +1020,7 @@ void ungetstring(char* text)
  * the text as if it were a macro.
  */
 {
-        register FILEINFO       *file;
+        FILEINFO       *file;
         extern FILEINFO         *getfile(int, char *);
         file = getfile(strlen(text) + 1, "");
         strcpy(file->buffer, text);
@@ -1033,7 +1033,7 @@ cget()
  * token concatenation
  */
 {
-        register int    c;
+        int    c;
 
         do {
             c = get();
@@ -1057,8 +1057,8 @@ static void domsg(char* severity, char* format, void* arg)
  * Print filenames, macro names, and line numbers for error messages.
  */
 {
-        register char           *tp;
-        register FILEINFO       *file;
+        char           *tp;
+        FILEINFO       *file;
 
         fprintf(stderr, "%sline %d, %s: ", MSG_PREFIX, line, &severity[1]);
         if (*severity == 'S')