Use static instead of extern, braces around if's, run through indent

[oweals/busybox.git] / util-linux / mkswap.c

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 7d690ad99b5e7c6b18626211e5ed638d1cbd89e5..de10ba71fbd724f7dff22661196e429223c172d2 100644 (file)
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -35,7 +35,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -45,6 +44,7 @@
 #include <sys/utsname.h>
 #include <asm/page.h>                  /* for PAGE_SIZE and PAGE_SHIFT */
                                /* we also get PAGE_SIZE via getpagesize() */
+#include "busybox.h"
 
 #ifndef _IO
 /* pre-1.3.45 */
@@ -72,7 +72,7 @@ static int version = -1;
 static int pagesize;
 static int *signature_page;
 
-struct swap_header_v1 {
+static struct swap_header_v1 {
        char bootbits[1024];            /* Space for disklabel etc. */
        unsigned int version;
        unsigned int last_page;
@@ -81,7 +81,7 @@ struct swap_header_v1 {
        unsigned int badpages[1];
 } *p;
 
-static void init_signature_page()
+static inline void init_signature_page(void)
 {
        pagesize = getpagesize();
 
@@ -94,7 +94,7 @@ static void init_signature_page()
        p = (struct swap_header_v1 *) signature_page;
 }
 
-static void write_signature(char *sig)
+static inline void write_signature(char *sig)
 {
        char *sp = (char *) signature_page;
 
@@ -147,7 +147,7 @@ It is roughly 2GB on i386, PPC, m68k, ARM, 1GB on sparc, 512MB on mips,
 
 #define MAX_BADPAGES   ((pagesize-1024-128*sizeof(int)-10)/sizeof(int))
 
-static void bit_set(unsigned int *addr, unsigned int nr)
+static inline void bit_set(unsigned int *addr, unsigned int nr)
 {
        unsigned int r, m;
 
@@ -179,7 +179,7 @@ static void page_ok(int page)
                bit_set(signature_page, page);
 }
 
-static void page_bad(int page)
+static inline void page_bad(int page)
 {
        if (version == 0)
                bit_test_and_clear(signature_page, page);
@@ -287,7 +287,7 @@ int mkswap_main(int argc, char **argv)
 
                                PAGES = strtol(argv[0], &tmp, 0) / blocks_per_page;
                                if (*tmp)
-                                       usage(mkswap_usage);
+                                       show_usage();
                        } else
                                device_name = argv[0];
                } else {
@@ -302,13 +302,13 @@ int mkswap_main(int argc, char **argv)
                                version = atoi(argv[0] + 2);
                                break;
                        default:
-                               usage(mkswap_usage);
+                               show_usage();
                        }
                }
        }
        if (!device_name) {
                error_msg("error: Nowhere to set up swap on?");
-               usage(mkswap_usage);
+               show_usage();
        }
        sz = get_size(device_name);
        if (!PAGES) {
@@ -331,12 +331,12 @@ int mkswap_main(int argc, char **argv)
        }
        if (version != 0 && version != 1) {
                error_msg("error: unknown version %d", version);
-               usage(mkswap_usage);
+               show_usage();
        }
        if (PAGES < 10) {
                error_msg("error: swap area needs to be at least %ldkB",
                                (long) (10 * pagesize / 1024));
-               usage(mkswap_usage);
+               show_usage();
        }
 #if 0
        maxpages = ((version == 0) ? V0_MAX_PAGES : V1_MAX_PAGES);