misc: consolidate version printing and close_stdout()

[thirdparty/util-linux.git] / sys-utils / blkdiscard.c

diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index c19b67bf4d9d13bdd7b94d4fd532a3abcdd4b46d..f9ba5e468e38be2d4f69f7d88a2a322fdd6ef8a5 100644 (file)
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        range[0] = 0;
        range[1] = ULLONG_MAX;
@@ -135,12 +135,6 @@ int main(int argc, char **argv)
 
        while ((c = getopt_long(argc, argv, "hVsvo:l:p:z", longopts, NULL)) != -1) {
                switch(c) {
-               case 'h':
-                       usage();
-                       break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'l':
                        range[1] = strtosize_or_err(optarg,
                                        _("failed to parse length"));
@@ -162,6 +156,11 @@ int main(int argc, char **argv)
                case 'z':
                        act = ACT_ZEROOUT;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }