delete tons of extra #includes

This commit is contained in:
Denis Vlasenko 2007-05-31 22:42:12 +00:00
parent fad2b86c9e
commit 9a7d38fe24
59 changed files with 68 additions and 176 deletions

View File

@ -11,12 +11,8 @@
* 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

View File

@ -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)

View File

@ -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"

View File

@ -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)

View File

@ -26,9 +26,6 @@
* [... History snipped ...]
*
*/
#include <stdio.h>
#include <string.h>
#include <unistd.h>
/* Default input buffer size */
#define IBUFSIZ 2048

View File

@ -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 */

View File

@ -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"
/*

View File

@ -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"
/*

View File

@ -6,7 +6,7 @@
*/
#include <fnmatch.h>
#include <stdlib.h>
#include "libbb.h"
#include "unarchive.h"
/* Find a string in a shell pattern list */

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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 */

View File

@ -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.

View File

@ -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)
{

View File

@ -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)
{

View File

@ -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);

View File

@ -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;

View File

@ -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"

View File

@ -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

View File

@ -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)
{

View File

@ -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;

View File

@ -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"

View File

@ -8,10 +8,6 @@
*/
#include "libbb.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
#define PIPE_PROGRESS_SIZE 4096

View File

@ -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;

View File

@ -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

View File

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

View File

@ -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"

View File

@ -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)

View File

@ -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"

View File

@ -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, ...)

View File

@ -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,

View File

@ -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 {

View File

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

View File

@ -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. */

View File

@ -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: "

View File

@ -7,10 +7,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <stdio.h>
#include "libbb.h"
/* Busybox mount uses either /proc/mounts or /etc/mtab to
* get the list of currently mounted filesystems */
const char bb_path_mtab_file[] =

View File

@ -7,11 +7,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <string.h>
#include "libbb.h"
/* Like strncpy but make sure the resulting string is always 0 terminated. */
char * safe_strncpy(char *dst, const char *src, size_t size)
{

View File

@ -16,14 +16,6 @@
* stored in memory. It runs at 22 cycles per byte on a Pentium P4 processor
*/
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "libbb.h"
#define SHA1_BLOCK_SIZE 64

View File

@ -6,7 +6,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <unistd.h>
#include <sched.h>
#include <getopt.h> /* optind */
#include "libbb.h"

View File

@ -54,15 +54,15 @@
Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
*/
#include "libbb.h"
#include "xregex.h"
#include <sys/wait.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
//#include <sys/wait.h>
//#include <sys/ioctl.h>
//#include <sys/socket.h>
#include <sys/un.h>
#include <dirent.h>
#include <syslog.h>
#include <sys/sysmacros.h>
#include "libbb.h"
#include "xregex.h"
/* Various defines taken from linux/major.h */

View File

@ -12,11 +12,8 @@
* initially busyboxified by Bernhard Fischer
*/
#include "libbb.h"
#include <stdio.h>
#include <utmp.h>
#include <time.h>
#include <stdlib.h>
#include "libbb.h"
int runlevel_main(int argc, char **argv);
int runlevel_main(int argc, char **argv)
@ -32,12 +29,15 @@ int runlevel_main(int argc, char **argv)
prev = ut->ut_pid / 256;
if (prev == 0) prev = 'N';
printf("%c %c\n", prev, ut->ut_pid % 256);
if (ENABLE_FEATURE_CLEAN_UP)
endutent();
return 0;
}
}
puts("unknown");
if (ENABLE_FEATURE_CLEAN_UP)
endutent();
return 1;
}

View File

@ -496,7 +496,6 @@ int delete_module(const char *);
/* The relocatable object is manipulated using elfin types. */
#include <stdio.h>
#include <elf.h>
#include <endian.h>

View File

@ -8,8 +8,8 @@
* Busybox port: Nick Fedchik <nick@fedchik.org.ua>
*/
#include <sys/ioctl.h>
#include <signal.h>
//#include <sys/ioctl.h>
//#include <signal.h>
#include <arpa/inet.h>
#include <net/if.h>

View File

@ -15,12 +15,8 @@
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
*/
#include <string.h>
#include "libbb.h"
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "utils.h"
#include "ip_common.h"
int preferred_family = AF_UNSPEC;
smallint oneline;

View File

@ -10,20 +10,15 @@
* Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
*/
#include "libbb.h"
#include <sys/socket.h>
#include <sys/ioctl.h>
//#include <sys/socket.h>
//#include <sys/ioctl.h>
#include <fnmatch.h>
#include <string.h>
#include <unistd.h>
#include <net/if.h>
#include <net/if_arp.h>
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
typedef struct filter_t {

View File

@ -7,20 +7,16 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
#include <sys/ioctl.h>
#include <sys/socket.h>
//#include <sys/ioctl.h>
//#include <sys/socket.h>
#include <net/if.h>
#include <net/if_packet.h>
#include <netpacket/packet.h>
#include <net/ethernet.h>
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
/* taken from linux/sockios.h */
#define SIOCSIFNAME 0x8923 /* set interface name */

View File

@ -13,11 +13,9 @@
* Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
*/
#include "libbb.h"
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
#ifndef RTAX_RTTVAR
#define RTAX_RTTVAR RTAX_HOPS

View File

@ -16,16 +16,16 @@
* initially integrated into busybox by Bernhard Fischer
*/
#include "libbb.h"
#include <syslog.h>
#include <sys/socket.h>
//#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <arpa/inet.h>
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
/*
static void usage(void) __attribute__((noreturn));
@ -41,6 +41,7 @@ static void usage(void)
exit(-1);
}
*/
static int print_rule(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
struct nlmsghdr *n, void *arg)
{

View File

@ -14,24 +14,20 @@
* Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag
*/
#include "libbb.h"
#include <sys/socket.h>
#include <sys/ioctl.h>
//#include <sys/socket.h>
//#include <sys/ioctl.h>
#include <netinet/ip.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <asm/types.h>
#ifndef __constant_htons
#define __constant_htons htons
#endif
#include <linux/if_tunnel.h>
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
/* Dies on error */

View File

@ -10,11 +10,9 @@
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*/
#include "libbb.h"
#include <string.h>
#include <net/if_arp.h>
#include "libbb.h"
#include "rt_names.h"
#include "utils.h"

View File

@ -11,16 +11,14 @@
*
*/
#include "libbb.h"
#include <string.h>
//#include <sys/socket.h> /* socket() */
#include <net/if.h> /* struct ifreq and co. */
//#include <sys/ioctl.h> /* ioctl() & SIOCGIFINDEX */
#include "libbb.h"
#include "libnetlink.h"
#include "ll_map.h"
#include <sys/socket.h> /* socket() */
#include <net/if.h> /* struct ifreq and co. */
#include <sys/ioctl.h> /* ioctl() & SIOCGIFINDEX */
struct idxmap {
struct idxmap * next;
int index;

View File

@ -11,7 +11,6 @@
*/
#include "libbb.h"
#include "rt_names.h"
#include "utils.h"

View File

@ -9,10 +9,10 @@
*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*/
#include <stdio.h>
#include <arpa/inet.h>
#include <linux/if_arp.h>
#include "libbb.h"
#include "rt_names.h"
const char* ll_type_n2a(int type, char *buf, int len)

View File

@ -11,8 +11,7 @@
*
*/
#include <stdlib.h>
#include <string.h>
#include "libbb.h"
#include "rt_names.h"
#include "utils.h"

View File

@ -12,7 +12,6 @@
*/
#include "libbb.h"
#include "utils.h"
#include "inet_common.h"

View File

@ -2,8 +2,6 @@
#ifndef __UTILS_H__
#define __UTILS_H__ 1
#include "libbb.h"
#include "libnetlink.h"
#include "ll_map.h"
#include "rtm_map.h"

View File

@ -9,9 +9,8 @@
* Licensed under GPLv2, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
#include <unistd.h>
#include <sys/klog.h>
#include "libbb.h"
int dmesg_main(int argc, char **argv);
int dmesg_main(int argc, char **argv)

View File

@ -7,8 +7,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <sys/ioctl.h>
//#include <sys/ioctl.h>
#include <sys/utsname.h>
#include <getopt.h>
#include "libbb.h"