diff options
| -rw-r--r-- | libbb/fclose_nonstdin.c | 3 | ||||
| -rw-r--r-- | libbb/perror_nomsg.c | 3 | ||||
| -rw-r--r-- | libbb/warn_ignoring_args.c | 2 | ||||
| -rw-r--r-- | shell/bbsh.c | 2 | ||||
| -rw-r--r-- | util-linux/mkswap.c | 13 |
5 files changed, 11 insertions, 12 deletions
diff --git a/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c index 951ab30d6..88e8474f2 100644 --- a/libbb/fclose_nonstdin.c +++ b/libbb/fclose_nonstdin.c @@ -12,8 +12,7 @@ * here to save a little space. */ -#include <stdio.h> -#include <libbb.h> +#include "libbb.h" int fclose_if_not_stdin(FILE *f) { diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c index 3a5079b99..3aefd5301 100644 --- a/libbb/perror_nomsg.c +++ b/libbb/perror_nomsg.c @@ -7,8 +7,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stddef.h> -#include <libbb.h> +#include "libbb.h" void bb_perror_nomsg(void) { diff --git a/libbb/warn_ignoring_args.c b/libbb/warn_ignoring_args.c index 6405ff826..be78a4414 100644 --- a/libbb/warn_ignoring_args.c +++ b/libbb/warn_ignoring_args.c @@ -7,7 +7,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <libbb.h> +#include "libbb.h" void bb_warn_ignoring_args(int n) { diff --git a/shell/bbsh.c b/shell/bbsh.c index 791983a3a..99e4f61fb 100644 --- a/shell/bbsh.c +++ b/shell/bbsh.c @@ -36,7 +36,7 @@ echo `echo hello#comment " woot` and more */ -#include <busybox.h> +#include "busybox.h" // A single executable, its arguments, and other information we know about it. #define BBSH_FLAG_EXIT 1 diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index 2dee5ac18..7baa3ecfb 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c @@ -6,7 +6,7 @@ * Licensed under GPL version 2, see file LICENSE in this tarball for details. */ -#include <busybox.h> +#include "busybox.h" int mkswap_main(int argc, char *argv[]) { @@ -16,18 +16,19 @@ int mkswap_main(int argc, char *argv[]) // No options supported. - if (argc!=2) bb_show_usage(); + if (argc != 2) bb_show_usage(); // Figure out how big the device is and announce our intentions. - fd = xopen(argv[1],O_RDWR); + fd = xopen(argv[1], O_RDWR); len = fdlength(fd); pagesize = getpagesize(); - printf("Setting up swapspace version 1, size = %ld bytes\n", (long)(len-pagesize)); + printf("Setting up swapspace version 1, size = %"OFF_FMT"d bytes\n", + len - pagesize); // Make a header. - memset(hdr, 0, 129 * sizeof(unsigned int)); + memset(hdr, 0, sizeof(hdr)); hdr[0] = 1; hdr[1] = (len / pagesize) - 1; @@ -35,7 +36,7 @@ int mkswap_main(int argc, char *argv[]) // signature on disk (not in cache) during swapon. xlseek(fd, 1024, SEEK_SET); - xwrite(fd, hdr, 129 * sizeof(unsigned int)); + xwrite(fd, hdr, sizeof(hdr)); xlseek(fd, pagesize-10, SEEK_SET); xwrite(fd, "SWAPSPACE2", 10); fsync(fd); |