From: Ruediger Meier <sweet_f_a@gmx.de>
To: util-linux@vger.kernel.org
Subject: [PATCH 04/13] blkid: use errtryhelp instead of errtryh
Date: Thu, 22 Jun 2017 04:37:37 +0200 [thread overview]
Message-ID: <1498099066-24235-5-git-send-email-sweet_f_a@gmx.de> (raw)
In-Reply-To: <1498099066-24235-1-git-send-email-sweet_f_a@gmx.de>
From: Ruediger Meier <ruediger.meier@ga-group.nl>
We have a --help option and this is preferred.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
misc-utils/blkid.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 1dc8f40..f95f673 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -762,7 +762,7 @@ int main(int argc, char **argv)
case 's':
if (numtag + 1 >= sizeof(ctl.show) / sizeof(*ctl.show)) {
warnx(_("Too many tags specified"));
- errtryh(err);
+ errtryhelp(err);
}
ctl.show[numtag++] = optarg;
break;
@@ -773,13 +773,13 @@ int main(int argc, char **argv)
if (search_type) {
warnx(_("Can only search for "
"one NAME=value pair"));
- errtryh(err);
+ errtryhelp(err);
}
if (blkid_parse_tag_string(optarg,
&search_type,
&search_value)) {
warnx(_("-t needs NAME=value pair"));
- errtryh(err);
+ errtryhelp(err);
}
break;
case 'V':
@@ -794,7 +794,7 @@ int main(int argc, char **argv)
usage(0);
break;
default:
- errtryh(EXIT_FAILURE);
+ errtryhelp(EXIT_FAILURE);
}
}
--
1.8.5.6
next prev parent reply other threads:[~2017-06-22 2:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-22 2:37 [PATCH 00/13] usage cleanup part 1 Ruediger Meier
2017-06-22 2:37 ` [PATCH 01/13] uuidd: remove unused define Ruediger Meier
2017-06-22 2:37 ` [PATCH 02/13] misc: remove superfluous null pointer checks for optarg Ruediger Meier
2017-06-22 2:37 ` [PATCH 03/13] misc: fix some broken exit codes Ruediger Meier
2017-06-22 20:49 ` Ruediger Meier
2017-06-22 2:37 ` Ruediger Meier [this message]
2017-06-22 2:37 ` [PATCH 05/13] dmesg: do not accept any non-option arguments Ruediger Meier
2017-06-22 2:37 ` [PATCH 06/13] setarch: print usage error if no argument given Ruediger Meier
2017-06-22 8:38 ` Karel Zak
2017-06-22 8:44 ` Ruediger Meier
2017-06-22 2:37 ` [PATCH 07/13] setarch: use errtryhelp() Ruediger Meier
2017-06-22 2:37 ` [PATCH 08/13] fsck: add --help and --version Ruediger Meier
2017-06-22 2:37 ` [PATCH 09/13] login: " Ruediger Meier
2017-06-22 8:42 ` Karel Zak
2017-06-22 2:37 ` [PATCH 10/13] whereis: " Ruediger Meier
2017-06-22 2:37 ` [PATCH 11/13] more: " Ruediger Meier
2017-06-22 2:37 ` [PATCH 12/13] mkfs.cramfs: " Ruediger Meier
2017-06-22 2:37 ` [PATCH 13/13] misc: no more errtryh() Ruediger Meier
2017-06-26 13:04 ` [PATCH 00/13] usage cleanup part 1 Rüdiger Meier
2017-06-26 14:07 ` Karel Zak
2017-06-26 14:44 ` Rüdiger Meier
2017-06-26 20:37 ` Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498099066-24235-5-git-send-email-sweet_f_a@gmx.de \
--to=sweet_f_a@gmx.de \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).