From 88f50b6bf5e79ca9d5f30e5899ace1cbda0950a4 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 10 Aug 2000 17:59:11 +0000 Subject: [PATCH] Some #include updates. -Erik --- applets/busybox.c | 8 ++++---- archival/gunzip.c | 1 - archival/gzip.c | 1 - busybox.c | 8 ++++---- console-tools/dumpkmap.c | 2 +- console-tools/loadacm.c | 1 - console-tools/loadfont.c | 1 - coreutils/date.c | 1 + coreutils/df.c | 1 - coreutils/ls.c | 1 - coreutils/mkfifo.c | 1 - coreutils/mknod.c | 1 - coreutils/printf.c | 1 - coreutils/tail.c | 1 - coreutils/test.c | 1 - coreutils/touch.c | 1 - date.c | 1 + df.c | 1 - dumpkmap.c | 2 +- dutmp.c | 1 - findutils/which.c | 1 - freeramdisk.c | 1 - fsck_minix.c | 1 - gunzip.c | 1 - gzip.c | 1 - kill.c | 1 - loadacm.c | 1 - loadfont.c | 1 - logger.c | 1 - ls.c | 1 - makedevs.c | 1 - miscutils/dutmp.c | 1 - miscutils/makedevs.c | 1 - mkfifo.c | 1 - mkfs_minix.c | 1 - mknod.c | 1 - mkswap.c | 1 - nfsmount.c | 1 - printf.c | 1 - procps/kill.c | 1 - sysklogd/logger.c | 1 - sysklogd/syslogd.c | 1 - syslogd.c | 1 - tail.c | 1 - test.c | 1 - touch.c | 1 - util-linux/freeramdisk.c | 1 - util-linux/fsck_minix.c | 1 - util-linux/mkfs_minix.c | 1 - util-linux/mkswap.c | 1 - util-linux/nfsmount.c | 1 - utility.c | 1 - which.c | 1 - 53 files changed, 12 insertions(+), 57 deletions(-) diff --git a/applets/busybox.c b/applets/busybox.c index 1ed44ed9b..2a05e1551 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -32,7 +32,7 @@ const struct BB_applet applets[] = { {"chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage}, #endif #ifdef BB_CHROOT - {"chroot", chroot_main, _BB_DIR_SBIN, chroot_usage}, + {"chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage}, #endif #ifdef BB_CLEAR {"clear", clear_main, _BB_DIR_USR_BIN, clear_usage}, @@ -65,7 +65,7 @@ const struct BB_applet applets[] = { {"dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage}, #endif #ifdef BB_DU - {"du", du_main, _BB_DIR_BIN, du_usage}, + {"du", du_main, _BB_DIR_USR_BIN, du_usage}, #endif #ifdef BB_DUMPKMAP {"dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage}, @@ -251,7 +251,7 @@ const struct BB_applet applets[] = { {"sleep", sleep_main, _BB_DIR_BIN, sleep_usage}, #endif #ifdef BB_SORT - {"sort", sort_main, _BB_DIR_BIN, sort_usage}, + {"sort", sort_main, _BB_DIR_USR_BIN, sort_usage}, #endif #ifdef BB_SYNC {"sync", sync_main, _BB_DIR_BIN, sync_usage}, @@ -278,7 +278,7 @@ const struct BB_applet applets[] = { {"test", test_main, _BB_DIR_USR_BIN, test_usage}, #endif #ifdef BB_TEE - {"tee", tee_main, _BB_DIR_BIN, tee_usage}, + {"tee", tee_main, _BB_DIR_USR_BIN, tee_usage}, #endif #ifdef BB_TOUCH {"touch", touch_main, _BB_DIR_USR_BIN, touch_usage}, diff --git a/archival/gunzip.c b/archival/gunzip.c index 330dee335..20af97aed 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -94,7 +94,6 @@ static char *license_msg[] = { #include #include #include -#include #include /* #include "tailor.h" */ diff --git a/archival/gzip.c b/archival/gzip.c index 19ad1a729..591b8cc7f 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -1609,7 +1609,6 @@ ulg deflate() #include #include #include -#include #include /* configuration */ diff --git a/busybox.c b/busybox.c index 1ed44ed9b..2a05e1551 100644 --- a/busybox.c +++ b/busybox.c @@ -32,7 +32,7 @@ const struct BB_applet applets[] = { {"chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage}, #endif #ifdef BB_CHROOT - {"chroot", chroot_main, _BB_DIR_SBIN, chroot_usage}, + {"chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage}, #endif #ifdef BB_CLEAR {"clear", clear_main, _BB_DIR_USR_BIN, clear_usage}, @@ -65,7 +65,7 @@ const struct BB_applet applets[] = { {"dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage}, #endif #ifdef BB_DU - {"du", du_main, _BB_DIR_BIN, du_usage}, + {"du", du_main, _BB_DIR_USR_BIN, du_usage}, #endif #ifdef BB_DUMPKMAP {"dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage}, @@ -251,7 +251,7 @@ const struct BB_applet applets[] = { {"sleep", sleep_main, _BB_DIR_BIN, sleep_usage}, #endif #ifdef BB_SORT - {"sort", sort_main, _BB_DIR_BIN, sort_usage}, + {"sort", sort_main, _BB_DIR_USR_BIN, sort_usage}, #endif #ifdef BB_SYNC {"sync", sync_main, _BB_DIR_BIN, sync_usage}, @@ -278,7 +278,7 @@ const struct BB_applet applets[] = { {"test", test_main, _BB_DIR_USR_BIN, test_usage}, #endif #ifdef BB_TEE - {"tee", tee_main, _BB_DIR_BIN, tee_usage}, + {"tee", tee_main, _BB_DIR_USR_BIN, tee_usage}, #endif #ifdef BB_TOUCH {"touch", touch_main, _BB_DIR_USR_BIN, touch_usage}, diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c index 4ce6e8698..13b7d8937 100644 --- a/console-tools/dumpkmap.c +++ b/console-tools/dumpkmap.c @@ -81,7 +81,7 @@ int dumpkmap_main(int argc, char **argv) errorMsg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value); } else { - write(1,&ke.kb_value,2); + write(1,(void*)&ke.kb_value,2); } } diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c index 2d70ffc5d..7f669bf08 100644 --- a/console-tools/loadacm.c +++ b/console-tools/loadacm.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 622142925..927c2bad4 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/coreutils/date.c b/coreutils/date.c index e0f0f3129..571a55625 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -31,6 +31,7 @@ #include #include #include +#include /* This 'date' command supports only 2 time setting formats, diff --git a/coreutils/df.c b/coreutils/df.c index 714c79965..d8f8b7739 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -25,7 +25,6 @@ #include "internal.h" #include #include -#include #include extern const char mtab_file[]; /* Defined in utility.c */ diff --git a/coreutils/ls.c b/coreutils/ls.c index e56e3bcfb..d7455f427 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -50,7 +50,6 @@ #include "internal.h" # include -#include #include #include #include diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c index 3db17bbbc..5d4126ac0 100644 --- a/coreutils/mkfifo.c +++ b/coreutils/mkfifo.c @@ -23,7 +23,6 @@ #include "internal.h" #include #include -#include #include extern int mkfifo_main(int argc, char **argv) diff --git a/coreutils/mknod.c b/coreutils/mknod.c index b51c8f3e3..b815aa198 100644 --- a/coreutils/mknod.c +++ b/coreutils/mknod.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/coreutils/printf.c b/coreutils/printf.c index 6a87fc319..94b809348 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/coreutils/tail.c b/coreutils/tail.c index 627373bfd..6c4a6f468 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -32,7 +32,6 @@ */ #include -#include #include #include #include diff --git a/coreutils/test.c b/coreutils/test.c index 818b3db12..6dde718c7 100644 --- a/coreutils/test.c +++ b/coreutils/test.c @@ -33,7 +33,6 @@ #include "internal.h" #include -#include #include #include #include diff --git a/coreutils/touch.c b/coreutils/touch.c index afdd265f7..464aedb55 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -25,7 +25,6 @@ #include "internal.h" #include #include -#include #include #include #include diff --git a/date.c b/date.c index e0f0f3129..571a55625 100644 --- a/date.c +++ b/date.c @@ -31,6 +31,7 @@ #include #include #include +#include /* This 'date' command supports only 2 time setting formats, diff --git a/df.c b/df.c index 714c79965..d8f8b7739 100644 --- a/df.c +++ b/df.c @@ -25,7 +25,6 @@ #include "internal.h" #include #include -#include #include extern const char mtab_file[]; /* Defined in utility.c */ diff --git a/dumpkmap.c b/dumpkmap.c index 4ce6e8698..13b7d8937 100644 --- a/dumpkmap.c +++ b/dumpkmap.c @@ -81,7 +81,7 @@ int dumpkmap_main(int argc, char **argv) errorMsg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value); } else { - write(1,&ke.kb_value,2); + write(1,(void*)&ke.kb_value,2); } } diff --git a/dutmp.c b/dutmp.c index 047b8805f..5a6eb076b 100644 --- a/dutmp.c +++ b/dutmp.c @@ -14,7 +14,6 @@ #include "internal.h" #include -#include #include #include diff --git a/findutils/which.c b/findutils/which.c index 943e10a57..b3fd934d7 100644 --- a/findutils/which.c +++ b/findutils/which.c @@ -23,7 +23,6 @@ #include "internal.h" #include -#include #include extern int which_main(int argc, char **argv) diff --git a/freeramdisk.c b/freeramdisk.c index 2da2427c1..64915b313 100644 --- a/freeramdisk.c +++ b/freeramdisk.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/fsck_minix.c b/fsck_minix.c index f980fe9ea..bc92f20b7 100644 --- a/fsck_minix.c +++ b/fsck_minix.c @@ -96,7 +96,6 @@ #include #include #include -#include #include diff --git a/gunzip.c b/gunzip.c index 330dee335..20af97aed 100644 --- a/gunzip.c +++ b/gunzip.c @@ -94,7 +94,6 @@ static char *license_msg[] = { #include #include #include -#include #include /* #include "tailor.h" */ diff --git a/gzip.c b/gzip.c index 19ad1a729..591b8cc7f 100644 --- a/gzip.c +++ b/gzip.c @@ -1609,7 +1609,6 @@ ulg deflate() #include #include #include -#include #include /* configuration */ diff --git a/kill.c b/kill.c index da46620dd..dc48d4337 100644 --- a/kill.c +++ b/kill.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #define KILL 0 diff --git a/loadacm.c b/loadacm.c index 2d70ffc5d..7f669bf08 100644 --- a/loadacm.c +++ b/loadacm.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/loadfont.c b/loadfont.c index 622142925..927c2bad4 100644 --- a/loadfont.c +++ b/loadfont.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/logger.c b/logger.c index 0e1ce8dce..f4a0f82fb 100644 --- a/logger.c +++ b/logger.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/ls.c b/ls.c index e56e3bcfb..d7455f427 100644 --- a/ls.c +++ b/ls.c @@ -50,7 +50,6 @@ #include "internal.h" # include -#include #include #include #include diff --git a/makedevs.c b/makedevs.c index 99dbc0bd5..c9802cca7 100644 --- a/makedevs.c +++ b/makedevs.c @@ -14,7 +14,6 @@ #include #include #include -#include int makedevs_main(int argc, char **argv) { diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c index 047b8805f..5a6eb076b 100644 --- a/miscutils/dutmp.c +++ b/miscutils/dutmp.c @@ -14,7 +14,6 @@ #include "internal.h" #include -#include #include #include diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 99dbc0bd5..c9802cca7 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -14,7 +14,6 @@ #include #include #include -#include int makedevs_main(int argc, char **argv) { diff --git a/mkfifo.c b/mkfifo.c index 3db17bbbc..5d4126ac0 100644 --- a/mkfifo.c +++ b/mkfifo.c @@ -23,7 +23,6 @@ #include "internal.h" #include #include -#include #include extern int mkfifo_main(int argc, char **argv) diff --git a/mkfs_minix.c b/mkfs_minix.c index 240dfded0..1bbccd978 100644 --- a/mkfs_minix.c +++ b/mkfs_minix.c @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include diff --git a/mknod.c b/mknod.c index b51c8f3e3..b815aa198 100644 --- a/mknod.c +++ b/mknod.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/mkswap.c b/mkswap.c index eacd8816c..70028dc2e 100644 --- a/mkswap.c +++ b/mkswap.c @@ -43,7 +43,6 @@ #include #include /* for _IO */ #include -#include #include /* for PAGE_SIZE and PAGE_SHIFT */ /* we also get PAGE_SIZE via getpagesize() */ diff --git a/nfsmount.c b/nfsmount.c index 5c29b5f6b..628772b1b 100644 --- a/nfsmount.c +++ b/nfsmount.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include diff --git a/printf.c b/printf.c index 6a87fc319..94b809348 100644 --- a/printf.c +++ b/printf.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/procps/kill.c b/procps/kill.c index da46620dd..dc48d4337 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #define KILL 0 diff --git a/sysklogd/logger.c b/sysklogd/logger.c index 0e1ce8dce..f4a0f82fb 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 508a6572b..dfc933dbf 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/syslogd.c b/syslogd.c index 508a6572b..dfc933dbf 100644 --- a/syslogd.c +++ b/syslogd.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/tail.c b/tail.c index 627373bfd..6c4a6f468 100644 --- a/tail.c +++ b/tail.c @@ -32,7 +32,6 @@ */ #include -#include #include #include #include diff --git a/test.c b/test.c index 818b3db12..6dde718c7 100644 --- a/test.c +++ b/test.c @@ -33,7 +33,6 @@ #include "internal.h" #include -#include #include #include #include diff --git a/touch.c b/touch.c index afdd265f7..464aedb55 100644 --- a/touch.c +++ b/touch.c @@ -25,7 +25,6 @@ #include "internal.h" #include #include -#include #include #include #include diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 2da2427c1..64915b313 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index f980fe9ea..bc92f20b7 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -96,7 +96,6 @@ #include #include #include -#include #include diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 240dfded0..1bbccd978 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index eacd8816c..70028dc2e 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c @@ -43,7 +43,6 @@ #include #include /* for _IO */ #include -#include #include /* for PAGE_SIZE and PAGE_SHIFT */ /* we also get PAGE_SIZE via getpagesize() */ diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index 5c29b5f6b..628772b1b 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include diff --git a/utility.c b/utility.c index bc5a5bdc0..3422d997a 100644 --- a/utility.c +++ b/utility.c @@ -50,7 +50,6 @@ #include #include #include -#include #include #include /* for uname(2) */ diff --git a/which.c b/which.c index 943e10a57..b3fd934d7 100644 --- a/which.c +++ b/which.c @@ -23,7 +23,6 @@ #include "internal.h" #include -#include #include extern int which_main(int argc, char **argv)