delete tons of extra #includes

RSAkidinUSA · May 31, 2007 · 9a7d38f · 9a7d38f
1 parent fad2b86
commit 9a7d38f
Show file tree

Hide file tree

Showing 59 changed files with 68 additions and 176 deletions.
diff --git a/archival/cpio.c b/archival/cpio.c
@@ -11,20 +11,16 @@
  *		Only supports new ASCII and CRC formats
  *
  */
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
-#define CPIO_OPT_EXTRACT			0x01
-#define CPIO_OPT_TEST				0x02
-#define CPIO_OPT_UNCONDITIONAL		0x04
-#define CPIO_OPT_VERBOSE			0x08
-#define CPIO_OPT_FILE				0x10
-#define CPIO_OPT_CREATE_LEADING_DIR	0x20
-#define CPIO_OPT_PRESERVE_MTIME		0x40
+#define CPIO_OPT_EXTRACT                0x01
+#define CPIO_OPT_TEST                   0x02
+#define CPIO_OPT_UNCONDITIONAL          0x04
+#define CPIO_OPT_VERBOSE                0x08
+#define CPIO_OPT_FILE                   0x10
+#define CPIO_OPT_CREATE_LEADING_DIR     0x20
+#define CPIO_OPT_PRESERVE_MTIME         0x40
 
 int cpio_main(int argc, char **argv);
 int cpio_main(int argc, char **argv)

diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
@@ -3,8 +3,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 ssize_t archive_xread_all_eof(archive_handle_t *archive_handle,
 			unsigned char *buf, size_t count)

diff --git a/archival/libunarchive/data_align.c b/archival/libunarchive/data_align.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/types.h>
+//#include <sys/types.h>
 
 #include "libbb.h"
 #include "unarchive.h"

diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c
@@ -3,6 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
 #include "unarchive.h"
 
 void data_extract_to_stdout(archive_handle_t *archive_handle)

diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c
@@ -26,9 +26,6 @@
  * [... History snipped ...]
  *
  */
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 /* Default input buffer size */
 #define	IBUFSIZ	2048

diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libunarchive/filter_accept_all.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /* Accept any non-null name, its not really a filter at all */

diff --git a/archival/libunarchive/filter_accept_list.c b/archival/libunarchive/filter_accept_list.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /*

diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /*

diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c
@@ -6,7 +6,7 @@
  */
 
 #include <fnmatch.h>
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /* Find a string in a shell pattern list */

diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libunarchive/get_header_tar_lzma.c
@@ -6,6 +6,7 @@
  * Licensed under GPL v2, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
 #include "unarchive.h"
 
 char get_header_tar_lzma(archive_handle_t * archive_handle)

diff --git a/archival/libunarchive/header_list.c b/archival/libunarchive/header_list.c
@@ -2,7 +2,7 @@
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include <stdio.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 void header_list(const file_header_t *file_header)

diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c
@@ -2,7 +2,7 @@
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include <stdio.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 void header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED)

diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
@@ -3,11 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-
 #include "libbb.h"
-
 #include "unarchive.h"
 
 /* transformer(), more than meets the eye */

diff --git a/archival/libunarchive/seek_by_read.c b/archival/libunarchive/seek_by_read.c
@@ -3,10 +3,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 /*  If we are reading through a pipe(), or from stdin then we can't lseek,
  *  we must read and discard the data to skip over it.

diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
@@ -2,11 +2,9 @@
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unarchive.h"
+
 #include "libbb.h"
+#include "unarchive.h"
 
 void unpack_ar_archive(archive_handle_t *ar_archive)
 {

diff --git a/console-tools/clear.c b/console-tools/clear.c
@@ -10,11 +10,8 @@
 
 /* no options, no getopt */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-
 int clear_main(int argc, char **argv);
 int clear_main(int argc, char **argv)
 {

diff --git a/console-tools/reset.c b/console-tools/reset.c
@@ -10,9 +10,6 @@
 
 /* no options, no getopt */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include "libbb.h"
 
 int reset_main(int argc, char **argv);

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
@@ -9,10 +9,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/ioctl.h>
+//#include <sys/ioctl.h>
 #include "libbb.h"
 
-
 /* From <linux/kd.h> */
 struct kbkeycode {
 	unsigned int scancode, keycode;

diff --git a/coreutils/df.c b/coreutils/df.c
@@ -18,10 +18,6 @@
  * the command line.  Properly round *-blocks, Used, and Available quantities.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <mntent.h>
 #include <sys/vfs.h>
 #include "libbb.h"

diff --git a/coreutils/id.c b/coreutils/id.c
@@ -14,9 +14,6 @@
  */
 
 #include "libbb.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
 
 #define PRINT_REAL        1
 #define NAME_NOT_NUMBER   2

diff --git a/coreutils/libcoreutils/getopt_mk_fifo_nod.c b/coreutils/libcoreutils/getopt_mk_fifo_nod.c
@@ -20,11 +20,8 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "libbb.h"
-#include "coreutils.h"
+//#include "coreutils.h"
 
 mode_t getopt_mk_fifo_nod(int argc, char **argv)
 {

diff --git a/coreutils/printenv.c b/coreutils/printenv.c
@@ -8,9 +8,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
 extern char **environ;
 

diff --git a/coreutils/uname.c b/coreutils/uname.c
@@ -30,12 +30,6 @@
  * Now does proper error checking on i/o.  Plus some further space savings.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include "libbb.h"
 

diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
@@ -8,10 +8,6 @@
  */
 
 #include "libbb.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
 
 #define PIPE_PROGRESS_SIZE 4096
 

diff --git a/include/unarchive.h b/include/unarchive.h
@@ -10,7 +10,7 @@
 #define ARCHIVE_NOPRESERVE_OWN          32
 #define ARCHIVE_NOPRESERVE_PERM         64
 
-#include "libbb.h"
+//#include "libbb.h"
 
 typedef struct file_headers_s {
 	char *name;

diff --git a/init/init.c b/init/init.c
@@ -11,9 +11,9 @@
 
 #include "libbb.h"
 #include <paths.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
+//#include <signal.h>
+//#include <sys/ioctl.h>
+//#include <sys/wait.h>
 #include <sys/reboot.h>
 
 #if ENABLE_FEATURE_INIT_SYSLOG

diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
@@ -11,8 +11,6 @@
  * return 1.  Otherwise return 0.
  */
 
-#include <stdio.h>
-#include <ctype.h>
 #include "libbb.h"
 
 int bb_ask_confirmation(void)

diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
@@ -8,13 +8,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
 #include <termios.h>
-#include <sys/ioctl.h>
+//#include <sys/ioctl.h>
 
 #include "libbb.h"
 

diff --git a/libbb/bb_do_delay.c b/libbb/bb_do_delay.c
@@ -7,8 +7,6 @@
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
 
-#include <time.h>
-#include <unistd.h>
 #include "libbb.h"
 
 void bb_do_delay(int seconds)

diff --git a/libbb/get_console.c b/libbb/get_console.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/ioctl.h>
+//#include <sys/ioctl.h>
 #include "libbb.h"
 
 

diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c
@@ -7,9 +7,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-
 #include "libbb.h"
 
 void bb_herror_msg(const char *s, ...)

diff --git a/libbb/human_readable.c b/libbb/human_readable.c
@@ -26,7 +26,6 @@
  *      and "#if 0"'d below.
  */
 
-#include <stdio.h>
 #include "libbb.h"
 
 const char *make_human_readable_str(unsigned long long size,

diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
@@ -8,9 +8,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "libbb.h"
 
 typedef struct ino_dev_hash_bucket_struct {

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
@@ -28,7 +28,7 @@
    - not true viewing if length prompt less terminal width
  */
 
-#include <sys/ioctl.h>
+//#include <sys/ioctl.h>
 #include "libbb.h"
 
 

diff --git a/libbb/llist.c b/libbb/llist.c
@@ -10,7 +10,6 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <stdlib.h>
 #include "libbb.h"
 
 /* Add data to the start of the linked list.  */

diff --git a/libbb/login.c b/libbb/login.c
@@ -10,12 +10,8 @@
  */
 
 #include <sys/param.h>  /* MAXHOSTNAMELEN */
-#include <stdio.h>
-#include <unistd.h>
-#include "libbb.h"
-
 #include <sys/utsname.h>
-#include <time.h>
+#include "libbb.h"
 
 #define LOGIN " login: "