Changes to m4/src/Attic/builtin.c,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      06/11/11 12:54:47

Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.50
retrieving revision 1.1.1.1.2.51
diff -u -b -r1.1.1.1.2.50 -r1.1.1.1.2.51
--- src/builtin.c       1 Nov 2006 22:29:08 -0000       1.1.1.1.2.50
+++ src/builtin.c       11 Nov 2006 12:54:46 -0000      1.1.1.1.2.51
@@ -359,12 +359,12 @@
 static char const digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 static const char *
-ntoa (register eval_t value, int radix)
+ntoa (eval_t value, int radix)
 {
   bool negative;
   unsigned_eval_t uvalue;
   static char str[256];
-  register char *s = &str[sizeof str];
+  char *s = &str[sizeof str];
 
   *--s = '\0';
 
@@ -667,9 +667,9 @@
 
   /* Make table of symbols invisible to expand_macro ().  */
 
-  (void) obstack_finish (obs);
+  obstack_finish (obs);
 
-  qsort ((char *) data.base, data.size, sizeof (symbol *), dumpdef_cmp);
+  qsort (data.base, data.size, sizeof (symbol *), dumpdef_cmp);
 
   for (; data.size > 0; --data.size, data.base++)
     {
@@ -1645,14 +1645,14 @@
 static const char *
 expand_ranges (const char *s, struct obstack *obs)
 {
-  char from;
-  char to;
+  unsigned char from;
+  unsigned char to;
 
-  for (from = '\0'; *s != '\0'; from = *s++)
+  for (from = '\0'; *s != '\0'; from = to_uchar (*s++))
     {
       if (*s == '-' && from != '\0')
        {
-         to = *++s;
+         to = to_uchar (*++s);
          if (to == '\0')
            {
              /* trailing dash */
@@ -1772,7 +1772,7 @@
 substitute (struct obstack *obs, const char *victim, const char *repl,
            struct re_registers *regs)
 {
-  register unsigned int ch;
+  int ch;
 
   for (;;)
     {
@@ -2031,7 +2031,7 @@
 expand_user_macro (struct obstack *obs, symbol *sym,
                   int argc, token_data **argv)
 {
-  register const char *text;
+  const char *text;
   int i;
 
   for (text = SYMBOL_TEXT (sym); *text != '\0';)