diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
commit | fb132e47370378474c68ad22c1c0cb2ccee178de (patch) | |
tree | 4f78d0fdd1c2fa2341c7d9bb17f9d98d099a238c /networking/libiproute | |
parent | 66cb7bed33da605674c3d24734466b8e8a60e337 (diff) | |
download | busybox-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.gz |
whitespace cleanup
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/ip_parse_common_args.c | 15 | ||||
-rw-r--r-- | networking/libiproute/ipaddress.c | 10 | ||||
-rw-r--r-- | networking/libiproute/iplink.c | 6 | ||||
-rw-r--r-- | networking/libiproute/iproute.c | 15 | ||||
-rw-r--r-- | networking/libiproute/iprule.c | 21 | ||||
-rw-r--r-- | networking/libiproute/iptunnel.c | 10 | ||||
-rw-r--r-- | networking/libiproute/libnetlink.c | 12 | ||||
-rw-r--r-- | networking/libiproute/libnetlink.h | 10 | ||||
-rw-r--r-- | networking/libiproute/ll_addr.c | 12 | ||||
-rw-r--r-- | networking/libiproute/ll_map.c | 15 | ||||
-rw-r--r-- | networking/libiproute/ll_proto.c | 12 | ||||
-rw-r--r-- | networking/libiproute/ll_types.c | 12 | ||||
-rw-r--r-- | networking/libiproute/rt_names.c | 12 | ||||
-rw-r--r-- | networking/libiproute/rtm_map.c | 13 | ||||
-rw-r--r-- | networking/libiproute/utils.c | 4 | ||||
-rw-r--r-- | networking/libiproute/utils.h | 6 |
16 files changed, 79 insertions, 106 deletions
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index bf01528c4..59c759b23 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c @@ -1,18 +1,15 @@ /* vi: set sw=4 ts=4: */ /* - * ip.c "ip" utility frontend. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * * Changes: * - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses + * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses */ #include "ip_common.h" /* #include "libbb.h" is inside */ diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 1be03a6c3..397a8ee34 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -1,13 +1,11 @@ /* vi: set sw=4 ts=4: */ /* - * ipaddress.c "ip address". - * * Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * * Changes: - * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated + * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated */ #include <fnmatch.h> @@ -20,7 +18,7 @@ #ifndef IFF_LOWER_UP /* from linux/if.h */ -#define IFF_LOWER_UP 0x10000 /* driver signals L1 up*/ +#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */ #endif struct filter_t { @@ -365,7 +363,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, struct nlmsg_list { struct nlmsg_list *next; - struct nlmsghdr h; + struct nlmsghdr h; }; static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo) diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index c5ba294aa..5a86ce678 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -296,9 +296,9 @@ static int do_change(char **argv, const unsigned rtm) }; struct rtnl_handle rth; struct { - struct nlmsghdr n; - struct ifinfomsg i; - char buf[1024]; + struct nlmsghdr n; + struct ifinfomsg i; + char buf[1024]; } req; smalluint arg; char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL; diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 1696e6a34..f66774afe 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -1,19 +1,16 @@ /* vi: set sw=4 ts=4: */ /* - * iproute.c "ip route". - * * Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - * + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * * Changes: * - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses + * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized */ -#include "ip_common.h" /* #include "libbb.h" is inside */ +#include "ip_common.h" /* #include "libbb.h" is inside */ #include "rt_names.h" #include "utils.h" @@ -327,9 +324,9 @@ IF_FEATURE_IP_RULE(ARG_table,) }; struct rtnl_handle rth; struct { - struct nlmsghdr n; - struct rtmsg r; - char buf[1024]; + struct nlmsghdr n; + struct rtmsg r; + char buf[1024]; } req; char mxbuf[256]; struct rtattr * mxrta = (void*)mxbuf; diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index 3af6a83a8..dd3265c7c 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c @@ -1,18 +1,15 @@ /* vi: set sw=4 ts=4: */ /* - * iprule.c "ip rule". - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * * Changes: * - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses + * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses * initially integrated into busybox by Bernhard Reutner-Fischer */ @@ -191,9 +188,9 @@ static int iprule_modify(int cmd, char **argv) bool table_ok = 0; struct rtnl_handle rth; struct { - struct nlmsghdr n; - struct rtmsg r; - char buf[1024]; + struct nlmsghdr n; + struct rtmsg r; + char buf[1024]; } req; smalluint key; diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index bce373d05..5942feafc 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -1,16 +1,14 @@ /* vi: set sw=4 ts=4: */ /* - * iptunnel.c "ip tunnel" - * * Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * * Changes: * - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses - * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit - * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag + * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses + * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit + * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag */ #include <netinet/ip.h> diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index 8da80b2fc..3a37d97f8 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -74,8 +74,8 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } }; struct msghdr msg = { (void*)&nladdr, sizeof(nladdr), - iov, 2, - NULL, 0, + iov, 2, + NULL, 0, 0 }; @@ -108,8 +108,8 @@ static int rtnl_dump_filter(struct rtnl_handle *rth, struct msghdr msg = { (void*)&nladdr, sizeof(nladdr), - &iov, 1, - NULL, 0, + &iov, 1, + NULL, 0, 0 }; @@ -214,8 +214,8 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, char *buf = xmalloc(8*1024); /* avoid big stack buffer */ struct msghdr msg = { (void*)&nladdr, sizeof(nladdr), - &iov, 1, - NULL, 0, + &iov, 1, + NULL, 0, 0 }; diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h index 4e4d5b7b9..51bee2d67 100644 --- a/networking/libiproute/libnetlink.h +++ b/networking/libiproute/libnetlink.h @@ -11,11 +11,11 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN struct rtnl_handle { - int fd; - struct sockaddr_nl local; - struct sockaddr_nl peer; - uint32_t seq; - uint32_t dump; + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; + uint32_t seq; + uint32_t dump; }; extern void xrtnl_open(struct rtnl_handle *rth) FAST_FUNC; diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c index c2c01305d..33a54ea6c 100644 --- a/networking/libiproute/ll_addr.c +++ b/networking/libiproute/ll_addr.c @@ -1,13 +1,11 @@ /* vi: set sw=4 ts=4: */ /* - * ll_addr.c + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> */ #include <net/if_arp.h> diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index 246b9e33a..27cd90f34 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -1,17 +1,14 @@ /* vi: set sw=4 ts=4: */ /* - * ll_map.c - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> */ -#include <net/if.h> /* struct ifreq and co. */ +#include <net/if.h> /* struct ifreq and co. */ #include "libbb.h" #include "libnetlink.h" diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index 1cd576f1d..04925ecf6 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c @@ -1,13 +1,11 @@ /* vi: set sw=4 ts=4: */ /* - * ll_proto.c + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> */ #include "libbb.h" diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c index 3861c2870..38b6c0516 100644 --- a/networking/libiproute/ll_types.c +++ b/networking/libiproute/ll_types.c @@ -1,13 +1,11 @@ /* vi: set sw=4 ts=4: */ /* - * ll_types.c + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> */ #include <arpa/inet.h> #include <linux/if_arp.h> diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c index 8dd16e3d3..c474ab903 100644 --- a/networking/libiproute/rt_names.c +++ b/networking/libiproute/rt_names.c @@ -1,13 +1,11 @@ /* vi: set sw=4 ts=4: */ /* - * rt_names.c rtnetlink names DB. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> */ #include "libbb.h" #include "rt_names.h" diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c index 5e358e105..3bab53baf 100644 --- a/networking/libiproute/rtm_map.c +++ b/networking/libiproute/rtm_map.c @@ -1,14 +1,11 @@ /* vi: set sw=4 ts=4: */ /* - * rtm_map.c - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. * + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> */ #include "libbb.h" diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c index 2b646f0ea..24698864d 100644 --- a/networking/libiproute/utils.c +++ b/networking/libiproute/utils.c @@ -4,11 +4,11 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * * Changes: * - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses + * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses */ #include "libbb.h" diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h index ed03e785a..93c9d25d6 100644 --- a/networking/libiproute/utils.h +++ b/networking/libiproute/utils.h @@ -17,14 +17,14 @@ extern smallint oneline; extern char _SL_; #ifndef IPPROTO_ESP -#define IPPROTO_ESP 50 +#define IPPROTO_ESP 50 #endif #ifndef IPPROTO_AH -#define IPPROTO_AH 51 +#define IPPROTO_AH 51 #endif #define SPRINT_BSIZE 64 -#define SPRINT_BUF(x) char x[SPRINT_BSIZE] +#define SPRINT_BUF(x) char x[SPRINT_BSIZE] extern void incomplete_command(void) NORETURN; |