summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko2013-01-14 15:57:44 +0100
committerDenys Vlasenko2013-01-14 15:57:44 +0100
commit60cb48ca50fcff24aa6c3927f51e4a508fa118f4 (patch)
tree493e30821f3d484b7395ce9d9e4be39ec9a43126 /networking
parentb8173b603f57dcf918a67f1ec00763ab5f4e1cf8 (diff)
downloadbusybox-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.zip
busybox-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.tar.gz
whitespace cleanup. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/brctl.c8
-rw-r--r--networking/ether-wake.c8
-rw-r--r--networking/ifenslave.c2
-rw-r--r--networking/interface.c2
-rw-r--r--networking/libiproute/ipaddress.c10
-rw-r--r--networking/libiproute/iprule.c14
-rw-r--r--networking/libiproute/iptunnel.c2
-rw-r--r--networking/netstat.c2
-rw-r--r--networking/route.c4
-rw-r--r--networking/tc.c5
-rw-r--r--networking/traceroute.c7
-rw-r--r--networking/udhcp/dhcpc.c2
12 files changed, 36 insertions, 30 deletions
diff --git a/networking/brctl.c b/networking/brctl.c
index b4f5809..207b069 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -133,9 +133,9 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
IF_FEATURE_BRCTL_FANCY(,
- ARG_stp,
- ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
- ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
+ ARG_stp,
+ ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
+ ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
)
IF_FEATURE_BRCTL_SHOW(, ARG_show)
};
@@ -285,7 +285,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
bb_error_msg_and_die(bb_msg_invalid_arg, *argv, "port");
memset(ifidx, 0, sizeof ifidx);
arm_ioctl(args, BRCTL_GET_PORT_LIST, (unsigned long)ifidx,
- MAX_PORTS);
+ MAX_PORTS);
xioctl(fd, SIOCDEVPRIVATE, &ifr);
for (i = 0; i < MAX_PORTS; i++) {
if (ifidx[i] == port) {
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index a73b0ba..bf09cd5 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -49,9 +49,9 @@
* Copyright 1999-2003 Donald Becker and Scyld Computing Corporation.
*
* The author may be reached as becker@scyld, or C/O
- * Scyld Computing Corporation
- * 914 Bay Ridge Road, Suite 220
- * Annapolis MD 21403
+ * Scyld Computing Corporation
+ * 914 Bay Ridge Road, Suite 220
+ * Annapolis MD 21403
*
* Notes:
* On some systems dropping root capability allows the process to be
@@ -113,7 +113,7 @@ void bb_debug_dump_packet(unsigned char *outpack, int pktsize)
* Host name
* IP address string
* MAC address string
-*/
+ */
static void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
{
struct ether_addr *eap;
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index f7f87bc..c3be818 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -270,7 +270,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
if (res < 0) {
ifr.ifr_addr.sa_family = AF_INET;
memset(ifr.ifr_addr.sa_data, 0,
- sizeof(ifr.ifr_addr.sa_data));
+ sizeof(ifr.ifr_addr.sa_data));
}
res = set_ifrname_and_do_ioctl(ifra[i].s_ioctl, &ifr, slave_ifname);
diff --git a/networking/interface.c b/networking/interface.c
index 4b9b948..9ae8b3f 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -27,7 +27,7 @@
* {1.34} - 19980630 - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* - gettext instead of catgets for i18n
* 10/1998 - Andi Kleen. Use interface list primitives.
- * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu
+ * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu
* (default AF was wrong)
*/
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index b3748e8..3fd3f44 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -314,14 +314,16 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
if (rta_tb[IFA_BROADCAST]) {
printf("brd %s ",
rt_addr_n2a(ifa->ifa_family,
- RTA_DATA(rta_tb[IFA_BROADCAST]),
- abuf, sizeof(abuf)));
+ RTA_DATA(rta_tb[IFA_BROADCAST]),
+ abuf, sizeof(abuf))
+ );
}
if (rta_tb[IFA_ANYCAST]) {
printf("any %s ",
rt_addr_n2a(ifa->ifa_family,
- RTA_DATA(rta_tb[IFA_ANYCAST]),
- abuf, sizeof(abuf)));
+ RTA_DATA(rta_tb[IFA_ANYCAST]),
+ abuf, sizeof(abuf))
+ );
}
printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1));
if (ifa->ifa_flags & IFA_F_SECONDARY) {
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index dd3265c..241a6bf 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -73,15 +73,17 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
if (tb[RTA_SRC]) {
if (r->rtm_src_len != host_len) {
printf("%s/%u", rt_addr_n2a(r->rtm_family,
- RTA_DATA(tb[RTA_SRC]),
- abuf, sizeof(abuf)),
+ RTA_DATA(tb[RTA_SRC]),
+ abuf, sizeof(abuf)),
r->rtm_src_len
- );
+ );
} else {
fputs(format_host(r->rtm_family,
- RTA_PAYLOAD(tb[RTA_SRC]),
- RTA_DATA(tb[RTA_SRC]),
- abuf, sizeof(abuf)), stdout);
+ RTA_PAYLOAD(tb[RTA_SRC]),
+ RTA_DATA(tb[RTA_SRC]),
+ abuf, sizeof(abuf)),
+ stdout
+ );
}
} else if (r->rtm_src_len) {
printf("0/%d", r->rtm_src_len);
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 5942fea..2b651b9 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -438,7 +438,7 @@ static void print_tunnel(struct ip_tunnel_parm *p)
printf(" inherit");
if (p->iph.tos & ~1)
printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
- rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
+ rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
}
if (!(p->iph.frag_off & htons(IP_DF)))
printf(" nopmtudisc");
diff --git a/networking/netstat.c b/networking/netstat.c
index 9c23957..c0c6ba5 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -187,7 +187,7 @@ static void prg_cache_add(long inode, char *name)
for (pnp = prg_hash + hi; (pn = *pnp) != NULL; pnp = &pn->next) {
if (pn->inode == inode) {
/* Some warning should be appropriate here
- as we got multiple processes for one i-node */
+ * as we got multiple processes for one i-node */
return;
}
}
diff --git a/networking/route.c b/networking/route.c
index 45f2be5..f662031 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -507,8 +507,8 @@ void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
while (1) {
int r;
r = fscanf(fp, "%63s%lx%lx%X%d%d%d%lx%d%d%d\n",
- devname, &d, &g, &flgs, &ref, &use, &metric, &m,
- &mtu, &win, &ir);
+ devname, &d, &g, &flgs, &ref, &use, &metric, &m,
+ &mtu, &win, &ir);
if (r != 11) {
if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
break;
diff --git a/networking/tc.c b/networking/tc.c
index 1574353..f968707 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -391,7 +391,7 @@ static int print_class(const struct sockaddr_nl *who UNUSED_PARAM,
printf("root ");
else if (msg->tcm_parent) {
classid = print_tc_classid(filter_qdisc ?
- TC_H_MIN(msg->tcm_parent) : msg->tcm_parent);
+ TC_H_MIN(msg->tcm_parent) : msg->tcm_parent);
printf("parent %s ", classid);
if (ENABLE_FEATURE_CLEAN_UP)
free(classid);
@@ -526,7 +526,8 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
duparg(*argv, "handle");
/* reject LONG_MIN || LONG_MAX */
/* TODO: for fw
- if ((slash = strchr(handle, '/')) != NULL)
+ slash = strchr(handle, '/');
+ if (slash != NULL)
*slash = '\0';
*/
msg.tcm_handle = get_u32(*argv, "handle");
diff --git a/networking/traceroute.c b/networking/traceroute.c
index d197e54..6b7b2eb 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -290,9 +290,10 @@
#endif
-#define OPT_STRING "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
- IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
- "4" IF_TRACEROUTE6("6")
+#define OPT_STRING \
+ "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
+ IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
+ "4" IF_TRACEROUTE6("6")
enum {
OPT_DONT_FRAGMNT = (1 << 0), /* F */
OPT_USE_ICMP = (1 << 1) * ENABLE_FEATURE_TRACEROUTE_USE_ICMP, /* I */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index f72217c..0862288 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1723,7 +1723,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
#endif
/* enter bound state */
timeout = lease_seconds / 2;
- temp_addr.s_addr = packet.yiaddr;
+ temp_addr.s_addr = packet.yiaddr;
bb_info_msg("Lease of %s obtained, lease time %u",
inet_ntoa(temp_addr), (unsigned)lease_seconds);
requested_ip = packet.yiaddr;