[groff] 16/26: [eqn,troff]: Tweak diagnostic messages.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 9a88e2bbdddea588c686c02031fb3ef2c26daca6
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Jul 13 04:52:30 2024 -0500

    [eqn,troff]: Tweak diagnostic messages.
    
    * src/preproc/eqn/main.cpp (main):
    * src/roff/troff/env.cpp (hyphen_trie::read_patterns_file):
    * src/roff/troff/input.cpp (next_file, do_open, close_request)
      (open_macro_package, process_macro_package_argument, do_macro_source)
      (process_input_file): Parallelize (and shorten) wording of diagnostic
      messages.
---
 ChangeLog                |  9 +++++++++
 src/preproc/eqn/main.cpp | 10 ++++------
 src/roff/troff/env.cpp   |  2 +-
 src/roff/troff/input.cpp | 16 ++++++++--------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6dc8d216..a4461c1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-07-13  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/preproc/eqn/main.cpp (main):
+       * src/roff/troff/env.cpp (hyphen_trie::read_patterns_file):
+       * src/roff/troff/input.cpp (next_file, do_open, close_request)
+       (open_macro_package, process_macro_package_argument)
+       (do_macro_source, process_input_file): Parallelize (and shorten)
+       wording of diagnostic messages.
+
 2024-07-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/libs/libgroff/font.cpp (text_file::~text_file)
diff --git a/src/preproc/eqn/main.cpp b/src/preproc/eqn/main.cpp
index 4beebd1c5..b2c43e938 100644
--- a/src/preproc/eqn/main.cpp
+++ b/src/preproc/eqn/main.cpp
@@ -450,8 +450,7 @@ int main(int argc, char **argv)
     if (fp != 0 /* nullptr */) {
       do_file(fp, path);
       if (fclose(fp) < 0)
-       fatal("unable to close '%1': %2", STARTUP_FILE,
-             strerror(errno));
+       fatal("cannot close '%1': %2", STARTUP_FILE, strerror(errno));
       free(path);
     }
   }
@@ -465,18 +464,17 @@ int main(int argc, char **argv)
        errno = 0;
        FILE *fp = fopen(argv[i], "r");
        if (!fp)
-         fatal("unable to open '%1': %2", argv[i], strerror(errno));
+         fatal("cannot open '%1': %2", argv[i], strerror(errno));
        else {
          do_file(fp, argv[i]);
          if (fclose(fp) < 0)
-           fatal("unable to close '%1': %2", argv[i], strerror(errno));
+           fatal("cannot close '%1': %2", argv[i], strerror(errno));
        }
       }
   if (ferror(stdout))
     fatal("standard output stream is in an error state");
   if (fflush(stdout) < 0)
-    fatal("unable to flush standard output stream: %1",
-         strerror(errno));
+    fatal("cannot flush standard output stream: %1", strerror(errno));
   exit(EXIT_SUCCESS);
 }
 
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index e01d29aa2..493a1b3f0 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -3946,7 +3946,7 @@ void hyphen_trie::read_patterns_file(const char *name, 
int append,
   char *path = 0;
   FILE *fp = mac_path->open_file(name, &path);
   if (0 /* nullptr */ == fp) {
-    error("can't find hyphenation patterns file '%1'", name);
+    error("cannot open hyphenation pattern file '%1'", name);
     return;
   }
   int c = hpf_getc(fp);
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 279669ea4..e4de41c82 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -899,7 +899,7 @@ void next_file()
     errno = 0;
     FILE *fp = include_search_path.open_file_cautious(nm.contents());
     if (0 /* nullptr */ == fp)
-      error("can't open '%1': %2", nm.contents(), strerror(errno));
+      error("cannot open '%1': %2", nm.contents(), strerror(errno));
     else
       input_stack::next_file(fp, nm.contents());
   }
@@ -6974,7 +6974,7 @@ static void do_open(bool append)
       errno = 0;
       FILE *fp = fopen(filename.contents(), append ? "a" : "w");
       if (0 /* nullptr */ == fp) {
-       error("unable to open file '%1' for %2: %3",
+       error("cannot open file '%1' for %2: %3",
              filename.contents(),
              append ? "appending" : "writing",
              strerror(errno));
@@ -7019,7 +7019,7 @@ static void close_request()
     else {
       int status = fclose(fp);
        if (status != 0)
-         error("unable to close stream '%1': %2", stream.contents(),
+         error("cannot close stream '%1': %2", stream.contents(),
                strerror(errno));
     }
   }
@@ -8029,7 +8029,7 @@ static FILE *open_macro_package(const char *mac, char 
**path)
   strcat(s1, MACRO_POSTFIX);
   FILE *fp = mac_path->open_file(s1, path);
   if ((0 /* nullptr */ == fp) && (ENOENT != errno))
-    error("unable to open macro file '%1': %2", s1, strerror(errno));
+    error("cannot open macro file '%1': %2", s1, strerror(errno));
   delete[] s1;
   if (0 /* nullptr */ == fp) {
     char *s2 = new char[strlen(mac) + strlen(MACRO_PREFIX) + 1];
@@ -8037,7 +8037,7 @@ static FILE *open_macro_package(const char *mac, char 
**path)
     strcat(s2, mac);
     fp = mac_path->open_file(s2, path);
     if ((0 /* nullptr */ == fp) && (ENOENT != errno))
-      error("unable to open macro file '%1': %2", s2, strerror(errno));
+      error("cannot open macro file '%1': %2", s2, strerror(errno));
     delete[] s2;
   }
   return fp;
@@ -8048,7 +8048,7 @@ static void process_macro_package_argument(const char 
*mac)
   char *path;
   FILE *fp = open_macro_package(mac, &path);
   if (0 /* nullptr */ == fp)
-    fatal("unable to open macro file for -m argument '%1'", mac);
+    fatal("cannot open macro file for -m argument '%1'", mac);
   const char *s = symbol(path).contents();
   free(path);
   input_stack::push(new file_iterator(fp, s));
@@ -8089,7 +8089,7 @@ void do_macro_source(bool quietly)
       // Suppress diagnostic only if we're operating quietly and it's an
       // expected problem.
       if (!quietly && (ENOENT == errno))
-       warning(WARN_FILE, "can't open macro file '%1': %2",
+       warning(WARN_FILE, "cannot open macro file '%1': %2",
                nm.contents(), strerror(errno));
     tok.next();
   }
@@ -8121,7 +8121,7 @@ static void process_input_file(const char *name)
     errno = 0;
     fp = include_search_path.open_file_cautious(name);
     if (0 /* nullptr */ == fp)
-      fatal("can't open '%1': %2", name, strerror(errno));
+      fatal("cannot open '%1': %2", name, strerror(errno));
   }
   input_stack::push(new file_iterator(fp, name));
   tok.next();