maint: address a couple of syntax-check errors.

	* cfg.mk (local-checks-to-skip): Remove sc_error_message_period
	and sc_error_message_uppercase.
	Address the uncovered issues.
	* po/POTFILES.in: Add missing files.
	* src/symtab.c: Remove useless includes.
	* lib/bitset_stats.c, src/files.c, tests/glr-regression.at: Use
	conformant error messages.

diff --git a/cfg.mk b/cfg.mk
index 515ac25307701465407b0cf5a290fd3dd000fe8d..18aa4a2545eaa5f2f1d443edd574e02e7644935c 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -36,8 +36,6 @@ url_dir_list = \
 local-checks-to-skip =                 \
   sc_immutable_NEWS                    \
   sc_bindtextdomain                    \
 local-checks-to-skip =                 \
   sc_immutable_NEWS                    \
   sc_bindtextdomain                    \

-  sc_error_message_period              \
-  sc_error_message_uppercase           \

   sc_program_name                      \
   sc_prohibit_HAVE_MBRTOWC             \
   sc_prohibit_always-defined_macros    \
   sc_program_name                      \
   sc_prohibit_HAVE_MBRTOWC             \
   sc_prohibit_always-defined_macros    \

diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c
index e97af2d8315dfe1d005a5c899965b30148611c2b..f6b87146ea568f003ede00499dff8ae4b1e1fa5f 100644 (file)
--- a/lib/bitset_stats.c
+++ b/lib/bitset_stats.c
@@ -256,12 +256,12 @@ bitset_stats_read (const char *file_name)
                  1, file) != 1)
         {
           if (ferror (file))
                  1, file) != 1)
         {
           if (ferror (file))

-            perror (_("Could not read stats file."));
+            perror (_("cannot read stats file"));

           else
           else

-            fprintf (stderr, _("Bad stats file size.\n"));
+            fprintf (stderr, _("bad stats file size\n"));

         }
       if (fclose (file) != 0)
         }
       if (fclose (file) != 0)

-        perror (_("Could not read stats file."));
+        perror (_("cannot read stats file"));

     }
   bitset_stats_info_data.runs++;
 }
     }
   bitset_stats_info_data.runs++;
 }


@@ -284,12 +284,12 @@ bitset_stats_write (const char *file_name)
     {
       if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
                   1, file) != 1)
     {
       if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
                   1, file) != 1)

-        perror (_("Could not write stats file."));
+        perror (_("cannot not write stats file"));

       if (fclose (file) != 0)
       if (fclose (file) != 0)

-        perror (_("Could not write stats file."));
+        perror (_("cannot write stats file"));

     }
   else
     }
   else

-    perror (_("Could not open stats file for writing."));
+    perror (_("cannot open stats file for writing"));

 }
 
 
 }
 
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 62847bb8fcf5619c5b84565b7976d56892b422a0..0908f5067abe3eafaea5f88c39f075f980dc0d75 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,7 @@ src/symtab.c
 djgpp/subpipe.c
 lib/argmatch.c
 lib/bitset_stats.c
 djgpp/subpipe.c
 lib/argmatch.c
 lib/bitset_stats.c

+lib/closeout.c

 lib/error.c
 lib/getopt.c
 lib/obstack.c
 lib/error.c
 lib/getopt.c
 lib/obstack.c

diff --git a/src/files.c b/src/files.c
index d80b718d67db377971ee091a5f3a8cbe15719635..208634cd2ddbafd76099d57f723481b51b691aac 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -127,7 +127,7 @@ xfclose (FILE *ptr)
     return;
 
   if (ferror (ptr))
     return;
 
   if (ferror (ptr))

-    error (EXIT_FAILURE, 0, _("I/O error"));
+    error (EXIT_FAILURE, 0, _("input/output error"));

 
   if (fclose (ptr) != 0)
     error (EXIT_FAILURE, get_errno (), _("cannot close file"));
 
   if (fclose (ptr) != 0)
     error (EXIT_FAILURE, get_errno (), _("cannot close file"));

diff --git a/src/symtab.c b/src/symtab.c
index 5a5956486ea46663b13fbf21f75e43f7b5a6e4c2..b3f94560cec26701292f3770eba290c4fcc20be6 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -22,11 +22,9 @@
 #include "system.h"
 
 #include <hash.h>
 #include "system.h"
 
 #include <hash.h>

-#include <quotearg.h>

 
 #include "complain.h"
 #include "gram.h"
 
 #include "complain.h"
 #include "gram.h"

-#include "quote.h"

 #include "symtab.h"
 
 /*-------------------------------------------------------------------.
 #include "symtab.h"
 
 /*-------------------------------------------------------------------.

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 070199ee72d43a753163ac8155ad64a4969e351b..a9bff580e722541acd2fdbeeffb34901fd2395c0 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1689,7 +1689,7 @@ empty2: ;
 static void
 yyerror (YYLTYPE *locp, char const *msg)
 {
 static void
 yyerror (YYLTYPE *locp, char const *msg)
 {

-  fprintf (stderr, "Error at %d.%d-%d.%d: %s.\n", locp->first_line,
+  fprintf (stderr, "%d.%d-%d.%d: %s.\n", locp->first_line,

            locp->first_column, locp->last_line, locp->last_column, msg);
 }
 
            locp->first_column, locp->last_line, locp->last_column, msg);
 }
 


@@ -1720,7 +1720,7 @@ AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],
 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],

-[Error at 1.1-2.3: syntax is ambiguous.
+[1.1-2.3: syntax is ambiguous.

 ])
 
 AT_CLEANUP
 ])
 
 AT_CLEANUP