Static-ify a variable. make du work with all the human-readable variants

[oweals/busybox.git] / swaponoff.c

diff --git a/swaponoff.c b/swaponoff.c
index 8a9134ca0075342a8066654ed441da594d770395..0613fa1e910cfa91f598f241a519dfd2aa14f6cc 100644 (file)
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <mntent.h>
 #include <dirent.h>
@@ -31,6 +30,7 @@
 #include <sys/mount.h>
 #include <sys/syscall.h>
 #include <linux/unistd.h>
+#include "busybox.h"
 
 _syscall2(int, swapon, const char *, path, int, flags);
 _syscall1(int, swapoff, const char *, path);
@@ -95,7 +95,7 @@ extern int swap_on_off_main(int argc, char **argv)
                                        struct stat statBuf;
 
                                        if (stat("/etc/fstab", &statBuf) < 0)
-                                               error_msg_and_die("/etc/fstab file missing\n");
+                                               error_msg_and_die("/etc/fstab file missing");
                                }
                                do_em_all();
                                break;
@@ -107,5 +107,5 @@ extern int swap_on_off_main(int argc, char **argv)
        return EXIT_SUCCESS;
 
   usage_and_exit:
-       usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
+       show_usage();
 }