Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
misc-utils/blkid.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index cc29b5c6c..eb2ea0735 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -640,7 +640,6 @@ int main(int argc, char **argv)
char **fltr_type = NULL;
int fltr_flag = BLKID_FLTR_ONLYIN;
unsigned int numdev = 0, numtag = 0;
- int version = 0;
int err = BLKID_EXIT_OTHER;
unsigned int i;
int output_format = 0;
@@ -757,8 +756,8 @@ int main(int argc, char **argv)
break;
case 'V':
case 'v':
- version = 1;
- break;
+ print_version(stdout);
+ goto exit;
case 'w':
/* ignore - backward compatibility */
break;
@@ -778,11 +777,6 @@ int main(int argc, char **argv)
devices[numdev++] = argv[optind++];
}
- if (version) {
- print_version(stdout);
- goto exit;
- }
-
/* convert LABEL/UUID lookup to evaluate request */
if (lookup && output_format == OUTPUT_DEVICE_ONLY && search_type &&
(!strcmp(search_type, "LABEL") || !strcmp(search_type, "UUID"))) {
--
2.12.0
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
