ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

uuidgen: use errx() rather than fprintf() when priting errors 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2020-11-22 22:27:24 +00:00
parent a6fae86865
commit 451d0e9e7b
No known key found for this signature in database
GPG Key ID: 0D46FEF7E61DBB46
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
misc-utils/uuidgen.c
View File

@ -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);
}
}