misc: consolidate version printing and close_stdout()

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

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 357dcb3f741ce9acc2d02c124602eb6fa124ec84..7e3135c729f3bac50f36b3a91d0a9eb692f9e293 100644 (file)
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -883,7 +883,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        memset(&ctl, 0, sizeof(struct swapon_ctl));
        ctl.props.priority = -1;
@@ -900,9 +900,6 @@ int main(int argc, char *argv[])
                case 'a':               /* all */
                        ctl.all = 1;
                        break;
-               case 'h':               /* help */
-                       usage();
-                       break;
                case 'o':
                        options = optarg;
                        break;
@@ -966,11 +963,13 @@ int main(int argc, char *argv[])
                case BYTES_OPTION:
                        ctl.bytes = 1;
                        break;
-               case 'V':               /* version */
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 0:
                        break;
+
+               case 'h':               /* help */
+                       usage();
+               case 'V':               /* version */
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }