[groff] 14/21: [troff]: Tweak format of diagnostic messages.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit a157358ba27aee65c75dab5da3b2f5225992aa2f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Aug 22 05:35:24 2022 -0500

    [troff]: Tweak format of diagnostic messages.
    
    * src/roff/troff/input.cpp (fatal_with_file_and_line)
      (error_with_file_and_line, debug_with_file_and_line): Align more
      closely with GNU Coding Standards regarding diagnostics: don't suffix
      the colon after the program name with a space when location
      information follows.
---
 ChangeLog                | 8 ++++++++
 src/roff/troff/input.cpp | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88ac8bdc9..ad87559b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-22  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/input.cpp (fatal_with_file_and_line)
+       (error_with_file_and_line, debug_with_file_and_line): Align more
+       closely with GNU Coding Standards regarding diagnostics: don't
+       suffix the colon after the program name with a space when
+       location information follows.
+
 2022-08-22  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/devices/grohtml/grohtml.1.man: Fix erroneous claim.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 2dfe3efac..edefb0b95 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -8876,7 +8876,7 @@ void fatal_with_file_and_line(const char *filename, int 
lineno,
                              const errarg &arg3)
 {
   if (program_name)
-    fprintf(stderr, "%s: ", program_name);
+    fprintf(stderr, "%s:", program_name);
   fprintf(stderr, "%s:", filename);
   if (lineno > 0)
     fprintf(stderr, "%d:", lineno);
@@ -8894,7 +8894,7 @@ void error_with_file_and_line(const char *filename, int 
lineno,
                              const errarg &arg3)
 {
   if (program_name)
-    fprintf(stderr, "%s: ", program_name);
+    fprintf(stderr, "%s:", program_name);
   fprintf(stderr, "%s:", filename);
   if (lineno > 0)
     fprintf(stderr, "%d:", lineno);
@@ -8912,7 +8912,7 @@ void debug_with_file_and_line(const char *filename,
                              const errarg &arg3)
 {
   if (program_name)
-    fprintf(stderr, "%s: ", program_name);
+    fprintf(stderr, "%s:", program_name);
   fprintf(stderr, "%s:", filename);
   if (lineno > 0)
     fprintf(stderr, "%d:", lineno);