FYI: branch-1_4 message spelling

[Eric Blake-1]

Another round of spelling fixes.  GNU coding standards prefer
invalid to illegal; the documentation mentions that we explicitly
use 'builtin' as a word (rather than the dictionary's 'built-in') in
part due to the spelling of the builtin; and 'Ill-formated' was just
plain wrong (I like 'ill-formed' better than 'ill-formatted').

I'm not going out of my way to fix typos in comments, since
those aren't user-visible.

I noticed ill-formated when I found a potential security hole in
CVS head: there, freeze.c can dereference random memory as
a function pointer if given a malicious frozen file.  Patch to follow.

Pardon the nabble footer; I'm not at my usual computer.

2006-06-15  Eric Blake  <address@hidden>

        Message cleanup.
        * src/symtab.c (lookup_symbol): Use invalid, not illegal.
        * src/freeze.c (reload_frozen_state): Fix typo in message.
        (produce_frozen_state): Standardize on builtin, not built-in.
        * src/builtin.c (numeric_arg, bad_argc): Likewise.

Index: src/symtab.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/symtab.c,v
retrieving revision 1.1.1.1.2.8
diff -u -r1.1.1.1.2.8 symtab.c
--- src/symtab.c        6 Jun 2006 13:20:57 -0000       1.1.1.1.2.8
+++ src/symtab.c        15 Jun 2006 21:19:06 -0000
@@ -309,7 +309,7 @@
 
     default:
       M4ERROR ((warning_status, 0,
-               "INTERNAL ERROR: Illegal mode to symbol_lookup ()"));
+               "INTERNAL ERROR: Invalid mode to symbol_lookup ()"));
       abort ();
     }
 }
Index: src/freeze.c
===================================================================
RCS file: /sources/m4/m4/src/freeze.c,v
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.4 freeze.c
--- src/freeze.c        6 Jun 2006 13:20:57 -0000       1.1.1.1.2.4
+++ src/freeze.c        15 Jun 2006 21:19:06 -0000
@@ -122,7 +122,7 @@
              if (bp == NULL)
                {
                  M4ERROR ((warning_status, 0, "\
-INTERNAL ERROR: Built-in not found in builtin table!"));
+INTERNAL ERROR: Builtin not found in builtin table!"));
                  abort ();
                }
              fprintf (file, "F%d,%d\n",
@@ -224,7 +224,7 @@
     switch (character)
       {
       default:
-       M4ERROR ((EXIT_FAILURE, 0, "Ill-formated frozen file"));
+       M4ERROR ((EXIT_FAILURE, 0, "Ill-formed frozen file"));
 
       case '\n':
 
Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.9
diff -u -r1.1.1.1.2.9 builtin.c
--- src/builtin.c       6 Jun 2006 13:20:57 -0000       1.1.1.1.2.9
+++ src/builtin.c       15 Jun 2006 21:19:06 -0000
@@ -272,13 +272,13 @@
     {
       if (!suppress_warnings)
        M4ERROR ((warning_status, 0,
-                 "Warning: Too few arguments to built-in `%s'",
+                 "Warning: Too few arguments to builtin `%s'",
                  TOKEN_DATA_TEXT (name)));
       isbad = TRUE;
     }
   else if (max > 0 && argc > max && !suppress_warnings)
     M4ERROR ((warning_status, 0,
-             "Warning: Excess arguments to built-in `%s' ignored",
+             "Warning: Excess arguments to builtin `%s' ignored",
              TOKEN_DATA_TEXT (name)));
 
   return isbad;
@@ -298,7 +298,7 @@
   if (*arg == 0 || (*valuep = strtol (arg, &endp, 10), *endp != 0))
     {
       M4ERROR ((warning_status, 0,
-               "Non-numeric argument to built-in `%s'",
+               "Non-numeric argument to builtin `%s'",
                TOKEN_DATA_TEXT (macro)));
       return FALSE;
     }

--
View this message in context: 
http://www.nabble.com/FYI%3A-branch-1_4-message-spelling-t1794794.html#a4890838
Sent from the Gnu - M4 - Patches forum at Nabble.com.