From d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 3 Aug 2006 15:41:12 +0000 Subject: Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.) --- networking/vconfig.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'networking/vconfig.c') diff --git a/networking/vconfig.c b/networking/vconfig.c index 6cbbb54ca..b90f41085 100644 --- a/networking/vconfig.c +++ b/networking/vconfig.c @@ -9,14 +9,8 @@ /* BB_AUDIT SUSv3 N/A */ -#include -#include -#include -#include -#include -#include -#include #include "busybox.h" +#include /* Stuff from linux/if_vlan.h, kernel version 2.4.23 */ enum vlan_ioctl_cmds { @@ -124,7 +118,7 @@ int vconfig_main(int argc, char **argv) /* Don't bother closing the filedes. It will be closed on cleanup. */ /* Will die if 802.1q is not present */ - bb_xopen3(conf_file_name, O_RDONLY, 0); + xopen3(conf_file_name, O_RDONLY, 0); memset(&ifr, 0, sizeof(struct vlan_ioctl_args)); @@ -159,7 +153,7 @@ int vconfig_main(int argc, char **argv) } } - fd = bb_xsocket(AF_INET, SOCK_STREAM, 0); + fd = xsocket(AF_INET, SOCK_STREAM, 0); if (ioctl(fd, SIOCSIFVLAN, &ifr) < 0) { bb_perror_msg_and_die("ioctl error for %s", *argv); } -- cgit v1.2.3