From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Tue, 20 Jun 2017 18:07:01 +0000 (+0200)
Subject: blkid: use errtryhelp instead of errtryh
X-Git-Tag: v2.31-rc1~268^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b7693cadac203133ad3a13013d507dbc6c1b6b7;p=thirdparty%2Futil-linux.git

blkid: use errtryhelp instead of errtryh

We have a --help option and this is preferred.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 1dc8f40854..f95f673a2e 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);
 		}
 	}