FYI: Error messages

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * m4/module.c, m4/output.c, src/main.c: Normalize error messages.

Index: m4/module.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/module.c,v
retrieving revision 1.15
diff -u -u -r1.15 module.c
--- m4/module.c 2001/10/11 21:09:16 1.15
+++ m4/module.c 2001/10/19 15:34:19
@@ -222,7 +222,7 @@
   /* Couldn't initialise the module system; diagnose and exit.  */
   if (errors)
     M4ERROR ((EXIT_FAILURE, 0,
-             _("ERROR: failed to initialise module loader: %s"),
+             _("failed to initialise module loader: %s"),
              m4_module_dlerror ()));
 
 #ifdef DEBUG_MODULES
@@ -274,7 +274,7 @@
     {
       /* Couldn't open the module; diagnose and exit. */
       M4ERROR ((EXIT_FAILURE, 0,
-               _("ERROR: cannot open module `%s': %s"),
+               _("cannot open module `%s': %s"),
                name, m4_module_dlerror ()));
     }
 
@@ -284,7 +284,7 @@
         if we were about to diagnose a module with no entry points.  */
       if (!lt_dlsym (handle, M4_FINISH_SYMBOL))
        M4ERROR ((EXIT_FAILURE, 0,
-                 _("ERROR: module `%s' has no entry points"),
+                 _("module `%s' has no entry points"),
                  name));
     }
 
@@ -374,7 +374,7 @@
   if (errors)
     {
       M4ERROR ((EXIT_FAILURE, 0,
-               _("ERROR: cannot close module `%s': %s"),
+               _("cannot close module `%s': %s"),
                name, m4_module_dlerror ()));
     }
 
@@ -402,7 +402,7 @@
   if (lt_dlexit() != 0)
     {
       M4ERROR ((EXIT_FAILURE, 0,
-               _("ERROR: cannot close modules: %s"),
+               _("cannot close modules: %s"),
                m4_module_dlerror ()));
     }
 }
@@ -517,7 +517,7 @@
   if (errors)
     {
       M4ERROR ((EXIT_FAILURE, 0,
-               _("ERROR: cannot unload module `%s': %s"),
+               _("cannot unload module `%s': %s"),
                name, m4_module_dlerror ()));
     }
 }
@@ -556,7 +556,7 @@
   if (errors)
     {
       M4ERROR ((EXIT_FAILURE, 0,
-               _("ERROR: cannot unload all modules: %s"),
+               _("cannot unload all modules: %s"),
                m4_module_dlerror ()));
     }
 }
Index: m4/output.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/output.c,v
retrieving revision 1.9
diff -u -u -r1.9 output.c
--- m4/output.c 2001/10/13 06:28:10 1.9
+++ m4/output.c 2001/10/19 15:34:19
@@ -284,7 +284,7 @@
       selected_diversion->file = tmpfile ();
       if (selected_diversion->file == NULL)
        M4ERROR ((EXIT_FAILURE, errno,
-                 _("ERROR: Cannot create temporary file for diversion")));
+                 _("cannot create temporary file for diversion")));
 
       if (selected_diversion->used > 0)
        {
@@ -294,7 +294,7 @@
                          selected_diversion->file);
          if (count != 1)
            M4ERROR ((EXIT_FAILURE, errno,
-                     _("ERROR: Cannot flush diversion to temporary file")));
+                     _("cannot flush diversion to temporary file")));
        }
 
       /* Reclaim the buffer space for other diversions.  */
@@ -372,7 +372,7 @@
     {
       count = fwrite (text, length, 1, output_file);
       if (count != 1)
-       M4ERROR ((EXIT_FAILURE, errno, _("ERROR: Copying inserted file")));
+       M4ERROR ((EXIT_FAILURE, errno, _("copying inserted file")));
     }
   else
     {
@@ -575,7 +575,7 @@
   while (length = read (fileno (file), buffer, COPY_BUFFER_SIZE),
         length != 0)
     if (length == (size_t) -1)
-      M4ERROR ((EXIT_FAILURE, errno, _("ERROR: Reading inserted file")));
+      M4ERROR ((EXIT_FAILURE, errno, _("reading inserted file")));
     else
       output_text (buffer, length);
 }
@@ -665,10 +665,10 @@
            {
              fflush (diversion->file);
              if (fstat (fileno (diversion->file), &file_stat) < 0)
-               M4ERROR ((EXIT_FAILURE, errno, _("Cannot stat diversion")));
+               M4ERROR ((EXIT_FAILURE, errno, _("cannot stat diversion")));
              if (file_stat.st_size < 0
                  || file_stat.st_size != (unsigned long) file_stat.st_size)
-               M4ERROR ((EXIT_FAILURE, errno, _("Diversion too large")));
+               M4ERROR ((EXIT_FAILURE, errno, _("diversion too large")));
              fprintf (file, "D%d,%lu", divnum,
                       (unsigned long) file_stat.st_size);
            }
Index: src/main.c
===================================================================
RCS file: /cvsroot/m4/m4/src/main.c,v
retrieving revision 1.31
diff -u -u -r1.31 main.c
--- src/main.c 2001/10/13 08:56:48 1.31
+++ src/main.c 2001/10/19 15:34:20
@@ -71,7 +71,7 @@
 stackovf_handler (void)
 {
   M4ERROR ((EXIT_FAILURE, 0,
-           _("ERROR: Stack overflow.  (Infinite define recursion?)")));
+           _("Stack overflow.  (Infinite define recursion?)")));
 }
 
 #endif /* USE_STACKOV */
@@ -304,11 +304,11 @@
            const char *dlerr = lt_dlerror();
            if (dlerr == NULL)
              M4ERROR ((EXIT_FAILURE, 0,
-                       _("ERROR: failed to add search directory `%s'"),
+                       _("failed to add search directory `%s'"),
                        optarg));
            else
              M4ERROR ((EXIT_FAILURE, 0,
-                       _("ERROR: failed to add search directory `%s': %s"),
+                       _("failed to add search directory `%s': %s"),
                        optarg, dlerr));
          }
        break;