maint: fix syntax-check issues in recent commit

Avoid 2 new syntax-check failures introduced in commit v8.23-19-g8defcee

* cfg.mk (sc_some_programs_must_avoid_exit_failure): s/exit/return/.
* src/whoami.c (main): Reinstate translation marker for diagnostic.

diff --git a/cfg.mk b/cfg.mk
index 26a5966fc5fd4c62e19f1a11512c25a7b3c3580a..178ff7625f61dcdbd92f2ffebc6e8c75bc5eef49 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -436,7 +436,7 @@ sc_prohibit_test_empty:
 sc_some_programs_must_avoid_exit_failure:
        @grep -nw EXIT_FAILURE                                          \
            $$(git grep -El '[^T]_FAILURE|EXIT_CANCELED' src)           \
-         | grep -vE '= EXIT_FAILURE|exit \(.* \?' | grep .             \
+         | grep -vE '= EXIT_FAILURE|return .* \?' | grep .             \
            && { echo '$(ME): do not use EXIT_FAILURE in the above'     \
                  1>&2; exit 1; } || :
 

diff --git a/src/whoami.c b/src/whoami.c
index 545e521345137a6eac52852adcc2d5e253d39fab..5ec0dc1149b27bf839275f65d323e4da21a527ff 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
   uid = geteuid ();
   pw = (uid == NO_UID && errno ? NULL : getpwuid (uid));
   if (!pw)
-    error (EXIT_FAILURE, errno, "cannot find name for user ID %lu",
+    error (EXIT_FAILURE, errno, _("cannot find name for user ID %lu"),
            (unsigned long int) uid);
   puts (pw->pw_name);
   return EXIT_SUCCESS;