misc: consolidate version printing and close_stdout()

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

diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index 0a3807fdac15e52cee6a90da7f0bb1e290f454dc..a13d4f1e582385af7f2bd44e9fadd3e914720d9f 100644 (file)
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((c = getopt_long(argc, argv, "ahvVL:U:",
                                 long_opts, NULL)) != -1) {
@@ -205,21 +205,20 @@ int main(int argc, char *argv[])
                case 'a':               /* all */
                        ++all;
                        break;
-               case 'h':               /* help */
-                       usage();
-                       break;
                case 'v':               /* be chatty */
                        ++verbose;
                        break;
-               case 'V':               /* version */
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'L':
                        add_label(optarg);
                        break;
                case 'U':
                        add_uuid(optarg);
                        break;
+
+               case 'h':               /* help */
+                       usage();
+               case 'V':               /* version */
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }