Merge remote-tracking branch 'origin/maint'

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 91c0c10ed29887a3e3d2ae31d6e5e225eaa5fdb4..7fea30647535041f69cb24f682bc14f2d0fb6462 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -139,7 +139,10 @@ xfdopen (int fd, char const *mode)
 {
   FILE *res = fdopen (fd, mode);
   if (! res)
-    error (EXIT_FAILURE, get_errno (), "fdopen");
+    error (EXIT_FAILURE, get_errno (),
+           // On a separate line to please the "unmarked_diagnostics"
+           // syntax-check.
+           "fdopen");
   return res;
 }
 
@@ -357,7 +360,7 @@ output_file_name_check (char **file_name)
   bool conflict = false;
   if (STREQ (*file_name, grammar_file))
     {
-      complain (_("refusing to overwrite the input file %s"),
+      complain (NULL, complaint, _("refusing to overwrite the input file %s"),
                 quote (*file_name));
       conflict = true;
     }
@@ -367,8 +370,8 @@ output_file_name_check (char **file_name)
       for (i = 0; i < file_names_count; i++)
         if (STREQ (file_names[i], *file_name))
           {
-            warn (_("conflicting outputs to file %s"),
-                  quote (*file_name));
+            complain (NULL, Wother, _("conflicting outputs to file %s"),
+                      quote (*file_name));
             conflict = true;
           }
     }