diff options
author | Denis Vlasenko | 2007-05-31 22:42:12 +0000 |
---|---|---|
committer | Denis Vlasenko | 2007-05-31 22:42:12 +0000 |
commit | 9a7d38fe2448617df98ecaea7dbe6f3131088586 (patch) | |
tree | 5966d651dcb5588e24106791f9cd3647f358112b /networking | |
parent | fad2b86c9e7eaadb973b50a1bc0e2accc1a96cfd (diff) | |
download | busybox-9a7d38fe2448617df98ecaea7dbe6f3131088586.zip busybox-9a7d38fe2448617df98ecaea7dbe6f3131088586.tar.gz |
delete tons of extra #includes
Diffstat (limited to 'networking')
-rw-r--r-- | networking/arping.c | 4 | ||||
-rw-r--r-- | networking/libiproute/ip_parse_common_args.c | 6 | ||||
-rw-r--r-- | networking/libiproute/ipaddress.c | 11 | ||||
-rw-r--r-- | networking/libiproute/iplink.c | 10 | ||||
-rw-r--r-- | networking/libiproute/iproute.c | 4 | ||||
-rw-r--r-- | networking/libiproute/iprule.c | 7 | ||||
-rw-r--r-- | networking/libiproute/iptunnel.c | 10 | ||||
-rw-r--r-- | networking/libiproute/ll_addr.c | 4 | ||||
-rw-r--r-- | networking/libiproute/ll_map.c | 10 | ||||
-rw-r--r-- | networking/libiproute/ll_proto.c | 1 | ||||
-rw-r--r-- | networking/libiproute/ll_types.c | 2 | ||||
-rw-r--r-- | networking/libiproute/rtm_map.c | 3 | ||||
-rw-r--r-- | networking/libiproute/utils.c | 1 | ||||
-rw-r--r-- | networking/libiproute/utils.h | 2 |
14 files changed, 24 insertions, 51 deletions
diff --git a/networking/arping.c b/networking/arping.c index 0371df3..d65be81 100644 --- a/networking/arping.c +++ b/networking/arping.c @@ -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> diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index 6efbc69..cea5b47 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c @@ -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; diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 4f83924..e504862 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -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 { diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 5feab1e..7db4d7e 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -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 */ diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 4efe9fd..75e5293 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -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 diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index 0499a09..e2e96f0 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c @@ -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) { diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index a2eb0cc..3327b27 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -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 */ diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c index b4a2187..ab5a2c5 100644 --- a/networking/libiproute/ll_addr.c +++ b/networking/libiproute/ll_addr.c @@ -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" diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index e9a1616..eb9b0a4 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -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; diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index aad460b..10d7498 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c @@ -11,7 +11,6 @@ */ #include "libbb.h" - #include "rt_names.h" #include "utils.h" diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c index 416ea6b..5d2843b 100644 --- a/networking/libiproute/ll_types.c +++ b/networking/libiproute/ll_types.c @@ -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) diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c index c16406b..7fad0ec 100644 --- a/networking/libiproute/rtm_map.c +++ b/networking/libiproute/rtm_map.c @@ -11,8 +11,7 @@ * */ -#include <stdlib.h> -#include <string.h> +#include "libbb.h" #include "rt_names.h" #include "utils.h" diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c index 9605c39..7fc1dbc 100644 --- a/networking/libiproute/utils.c +++ b/networking/libiproute/utils.c @@ -12,7 +12,6 @@ */ #include "libbb.h" - #include "utils.h" #include "inet_common.h" diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h index 3b6fef1..3bbc71d 100644 --- a/networking/libiproute/utils.h +++ b/networking/libiproute/utils.h @@ -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" |