diff options
Diffstat (limited to 'sys-utils/swapon.c')
| -rw-r--r-- | sys-utils/swapon.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 357dcb3f7..7e3135c72 100644 --- 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); } |