]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
blkid: use errtryhelp instead of errtryh
authorRuediger Meier <ruediger.meier@ga-group.nl>
Tue, 20 Jun 2017 18:07:01 +0000 (20:07 +0200)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Thu, 22 Jun 2017 19:34:40 +0000 (21:34 +0200)
We have a --help option and this is preferred.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
misc-utils/blkid.c

index 1dc8f40854c79a00bfb29211b625a56ac10ca6c7..f95f673a2ebe71a264c8f91d165b4d5ce581e8a2 100644 (file)
@@ -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);
                }
        }