lib/strutils: call gettext() only when argument of --hyperlink is invalid

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

diff --git a/include/strutils.h b/include/strutils.h
index a81fdea89eb5a26576d15596e32b85aec1e51fb7..70f97f0c866f80eaf5a029a5a3440ece44d65172 100644 (file)
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -59,7 +59,7 @@ extern void strtotimespec_or_err(const char *str, struct timespec *ts,
                const char *errmesg);
 extern time_t strtotime_or_err(const char *str, const char *errmesg);
 
-extern bool hyperlinkwanted_or_err(const char *mode, const char *errmesg);
+extern bool hyperlinkwanted(const char *mode);
 
 extern int isdigit_strend(const char *str, const char **end);
 #define isdigit_string(_s)     isdigit_strend(_s, NULL)

diff --git a/lib/strutils.c b/lib/strutils.c
index af538207a8f867a5f7113bf59459267c35769c6c..64fefa87861c1805f74cb6a96c3885452b584b59 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -524,7 +524,7 @@ time_t strtotime_or_err(const char *str, const char *errmesg)
        return (time_t) user_input;
 }
 
-bool hyperlinkwanted_or_err(const char *mode, const char *errmesg)
+bool hyperlinkwanted(const char *mode)
 {
        if (mode && strcmp(mode, "never") == 0)
                return false;
@@ -535,7 +535,7 @@ bool hyperlinkwanted_or_err(const char *mode, const char *errmesg)
        if (!mode || strcmp(mode, "auto") == 0)
                return isatty(STDOUT_FILENO) ? true : false;
 
-       errx(EXIT_FAILURE, "%s: '%s'", errmesg, mode);
+       errx(EXIT_FAILURE, _("invalid argument of --hyperlink: %s"), mode);
 }
 
 /*

diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c
index d05a093966fc697deac0cf6c21365747c38fee54..ffaca8c311ba56cfc4a053de05bf4aa64eccd187 100644 (file)
--- a/lsfd-cmd/lsfd.c
+++ b/lsfd-cmd/lsfd.c
@@ -2648,8 +2648,7 @@ int main(int argc, char *argv[])
                                err(EXIT_FAILURE, _("failed to drop privilege"));
                        break;
                case OPT_HYPERLINK:
-                       if (hyperlinkwanted_or_err(optarg,
-                                       _("invalid hyperlink argument")))
+                       if (hyperlinkwanted(optarg))
                                ctl.uri = xgethosturi(NULL);
                        break;
                case 'V':

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 130ac1b13906cff93e25e72a5278142b0c9966e9..1211bfa07dc7d4459fb5ddbe211bff01e96d2e76 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -2026,8 +2026,7 @@ int main(int argc, char *argv[])
                        findmnt.flags |= FL_SHADOWED;
                        break;
                case FINDMNT_OPT_HYPERLINK:
-                       if (hyperlinkwanted_or_err(optarg,
-                                       _("invalid hyperlink argument")))
+                       if (hyperlinkwanted(optarg))
                                findmnt.uri = xgethosturi(NULL);
                        break;
                case FINDMNT_OPT_ID:

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index a65f5e4e621defb85cf2fbb1da97f8dc1c87a530..da44bd631954cdcd6624897978910159c0218642 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -2678,8 +2678,7 @@ int main(int argc, char *argv[])
                                errtryhelp(EXIT_FAILURE);
                        break;
                case OPT_HYPERLINK:
-                       if (hyperlinkwanted_or_err(optarg,
-                                       _("invalid hyperlink argument")))
+                       if (hyperlinkwanted(optarg))
                                lsblk->uri = xgethosturi(NULL);
                        break;
                case 'H':