From 451d0e9e7b0318b3627cd578dde3eb654ca6c68d Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 22 Nov 2020 22:27:24 +0000 Subject: [PATCH] uuidgen: use errx() rather than fprintf() when priting errors Signed-off-by: Sami Kerola --- misc-utils/uuidgen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c index fa148abae6..7983cb8daf 100644 --- a/misc-utils/uuidgen.c +++ b/misc-utils/uuidgen.c @@ -49,7 +49,7 @@ static char *unhex(const char *value, size_t *valuelen) if (*valuelen % 2 != 0) { badstring: - fprintf(stderr, "%s: not a valid hex string\n", program_invocation_short_name); + warnx(_("not a valid hex string")); errtryhelp(EXIT_FAILURE); } @@ -140,20 +140,20 @@ main (int argc, char *argv[]) if (namespace) { if (!name) { - fprintf(stderr, "%s: --namespace requires --name argument\n", program_invocation_short_name); + warnx(_("--namespace requires --name argument")); errtryhelp(EXIT_FAILURE); } if (do_type != UUID_TYPE_DCE_MD5 && do_type != UUID_TYPE_DCE_SHA1) { - fprintf(stderr, "%s: --namespace requires --md5 or --sha1\n", program_invocation_short_name); + warnx(_("--namespace requires --md5 or --sha1")); errtryhelp(EXIT_FAILURE); } } else { if (name) { - fprintf(stderr, "%s: --name requires --namespace argument\n", program_invocation_short_name); + warnx(_("--name requires --namespace argument")); errtryhelp(EXIT_FAILURE); } if (do_type == UUID_TYPE_DCE_MD5 || do_type == UUID_TYPE_DCE_SHA1) { - fprintf(stderr, "%s: --md5 or --sha1 require --namespace\n", program_invocation_short_name); + warnx(_("--md5 or --sha1 requires --namespace argument")); errtryhelp(EXIT_FAILURE); } } @@ -178,13 +178,13 @@ main (int argc, char *argv[]) uuidptr = uuid_get_template(&namespace[1]); if (uuidptr == NULL) { - fprintf(stderr, "%s: unknown namespace alias '%s'\n", program_invocation_short_name, namespace); + warnx(_("unknown namespace alias: '%s'"), namespace); errtryhelp(EXIT_FAILURE); } memcpy(ns, *uuidptr, sizeof(ns)); } else { if (uuid_parse(namespace, ns) != 0) { - fprintf(stderr, "%s: invalid uuid for namespace '%s'\n", program_invocation_short_name, namespace); + warnx(_("invalid uuid for namespace: '%s'"), namespace); errtryhelp(EXIT_FAILURE); } } -- 2.47.2