[BusyBox-cvs] busybox/networking/libiproute ipaddress.c,1.5,1.6 iplink.c,1.3,1.4 iproute.c,1.7,1.8 iptunnel.c,1.2,1.3 libnetlink.c,1.2,1.3 ll_addr.c,1.2,1.3 ll_map.c,1.1,1.2 ll_proto.c,1.1,1.2 ll_types.c,1.1,1.2 rt_names.c,1.1,1.2 rtm_map.c,1.1,1.2 utils.c,1.3,1.4
Glenn McGrath
bug1 at busybox.net
Mon Dec 16 07:37:25 UTC 2002
Update of /var/cvs/busybox/networking/libiproute
In directory winder:/tmp/cvs-serv3783/networking/libiproute
Modified Files:
ipaddress.c iplink.c iproute.c iptunnel.c libnetlink.c
ll_addr.c ll_map.c ll_proto.c ll_types.c rt_names.c rtm_map.c
utils.c
Log Message:
Only included headers that are used.
Index: ipaddress.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/ipaddress.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ipaddress.c 11 Dec 2002 03:55:52 -0000 1.5
+++ ipaddress.c 16 Dec 2002 07:37:20 -0000 1.6
@@ -12,31 +12,24 @@
* Laszlo Valko <valko at linux.karinthy.hu> 990223: address label must be zero terminated
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
+
#include <fnmatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
#define sysinfo kernel_sysinfo
-#include <linux/netdevice.h>
#include <linux/if_arp.h>
-#include <linux/sockios.h>
#undef sysinfo
#include "rt_names.h"
#include "utils.h"
-#include "ll_map.h"
-#include "ip_common.h"
-#include "busybox.h"
+#include "libbb.h"
static struct
{
Index: iplink.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/iplink.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iplink.c 2 Dec 2002 01:40:05 -0000 1.3
+++ iplink.c 16 Dec 2002 07:37:20 -0000 1.4
@@ -10,28 +10,24 @@
*
*/
-#include <stdio.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <errno.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/socket.h>
+
#include <linux/if.h>
#include <linux/if_packet.h>
#include <linux/if_ether.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <linux/sockios.h>
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
-#include "busybox.h"
+#include "libbb.h"
static int do_link;
Index: iproute.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- iproute.c 2 Dec 2002 00:54:10 -0000 1.7
+++ iproute.c 16 Dec 2002 07:37:20 -0000 1.8
@@ -15,23 +15,15 @@
* Kunihiro Ishiguro <kunihiro at zebra.org> 001102: rtnh_ifindex was not initialized
*/
-#include <stdio.h>
+#include <sys/socket.h>
+
#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
#include <string.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-#include <linux/in_route.h>
#include "rt_names.h"
#include "utils.h"
-#include "busybox.h"
+#include "libbb.h"
#ifndef RTAX_RTTVAR
#define RTAX_RTTVAR RTAX_HOPS
Index: iptunnel.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/iptunnel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- iptunnel.c 28 Nov 2002 12:19:51 -0000 1.2
+++ iptunnel.c 16 Dec 2002 07:37:21 -0000 1.3
@@ -16,26 +16,23 @@
* Phil Karn <karn at ka9q.ampr.org> 990408: "pmtudisc" flag
*/
-#include <stdio.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
+
#include <arpa/inet.h>
+#include <netinet/ip.h>
-#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/if_tunnel.h>
#include "rt_names.h"
#include "utils.h"
-#include "busybox.h"
+#include "libbb.h"
static int do_ioctl_get_ifindex(char *dev)
{
Index: libnetlink.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/libnetlink.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libnetlink.c 28 Nov 2002 12:35:46 -0000 1.2
+++ libnetlink.c 16 Dec 2002 07:37:21 -0000 1.3
@@ -10,18 +10,13 @@
*
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <net/if_arp.h>
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
+
#include <errno.h>
+#include <stdio.h>
+#include <string.h>
#include <time.h>
-#include <sys/uio.h>
+#include <unistd.h>
#include "libnetlink.h"
#include "libbb.h"
Index: ll_addr.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/ll_addr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ll_addr.c 28 Nov 2002 12:39:19 -0000 1.2
+++ ll_addr.c 16 Dec 2002 07:37:21 -0000 1.3
@@ -9,21 +9,10 @@
* Authors: Alexey Kuznetsov, <kuznet at ms2.inr.ac.ru>
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
-#include <linux/netdevice.h>
#include <linux/if_arp.h>
-#include <linux/sockios.h>
#include "utils.h"
#include "libbb.h"
Index: ll_map.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/ll_map.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ll_map.c 10 Nov 2002 01:33:51 -0000 1.1
+++ ll_map.c 16 Dec 2002 07:37:21 -0000 1.2
@@ -11,16 +11,11 @@
*/
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
#include <netinet/in.h>
-#include <string.h>
#include "libnetlink.h"
-#include "ll_map.h"
struct idxmap
{
Index: ll_proto.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/ll_proto.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ll_proto.c 10 Nov 2002 01:33:51 -0000 1.1
+++ ll_proto.c 16 Dec 2002 07:37:21 -0000 1.2
@@ -10,20 +10,10 @@
*/
#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
-#include <linux/netdevice.h>
#include <linux/if_arp.h>
-#include <linux/sockios.h>
#include "utils.h"
Index: ll_types.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/ll_types.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ll_types.c 10 Nov 2002 01:33:51 -0000 1.1
+++ ll_types.c 16 Dec 2002 07:37:21 -0000 1.2
@@ -8,22 +8,10 @@
*
* Authors: Alexey Kuznetsov, <kuznet at ms2.inr.ac.ru>
*/
-
#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
-#include <string.h>
-#include <linux/netdevice.h>
#include <linux/if_arp.h>
-#include <linux/sockios.h>
char * ll_type_n2a(int type, char *buf, int len)
{
Index: rt_names.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/rt_names.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rt_names.c 10 Nov 2002 01:33:52 -0000 1.1
+++ rt_names.c 16 Dec 2002 07:37:21 -0000 1.2
@@ -8,14 +8,10 @@
*
* Authors: Alexey Kuznetsov, <kuznet at ms2.inr.ac.ru>
*/
-
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
#include <string.h>
-#include <sys/time.h>
+
#include <stdint.h>
static void rtnl_tab_initialize(char *file, char **tab, int size)
Index: rtm_map.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/rtm_map.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rtm_map.c 10 Nov 2002 01:33:52 -0000 1.1
+++ rtm_map.c 16 Dec 2002 07:37:21 -0000 1.2
@@ -10,14 +10,8 @@
*
*/
-#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
#include "rt_names.h"
#include "utils.h"
Index: utils.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- utils.c 28 Nov 2002 12:45:48 -0000 1.3
+++ utils.c 16 Dec 2002 07:37:21 -0000 1.4
@@ -14,19 +14,10 @@
* Rani Assaf <rani at magic.metawire.com> 980929: resolve addresses
*/
-#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
#include <string.h>
-#include <netdb.h>
#include <arpa/inet.h>
-#include <resolv.h>
-#include "./linux/pkt_sched.h"
#include "utils.h"
#include "libbb.h"
More information about the busybox-cvs
mailing list