summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-09-09 10:25:39 +0100
committerPádraig Brady <P@draigBrady.com>2014-09-09 10:28:34 +0100
commit20f46a2e347a53855b70b47297cd1856741d6265 (patch)
treef93a50b503f518f350a25586f4eac0e2bbeb20f7
parentc383c570c67e0ede0d3aa0ce08961d5745e7764d (diff)
downloadcoreutils-20f46a2e347a53855b70b47297cd1856741d6265.tar.xz
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.
-rw-r--r--cfg.mk2
-rw-r--r--src/whoami.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cfg.mk b/cfg.mk
index 26a5966fc..178ff7625 100644
--- 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 545e52134..5ec0dc114 100644
--- 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;