matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whitespace and indentation cleanup 

Need to go over whole source and scrub..
This commit is contained in:
Stephen Hemminger 2014-05-09 12:36:46 -07:00
parent 30b557929f
commit 4b726cb176
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ip/ip6tunnel.c
View File

@ -152,10 +152,10 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)
strcmp(*argv, "any") == 0) strcmp(*argv, "any") == 0)
p->proto = 0; p->proto = 0;
else { else {
fprintf(stderr,"Unknown tunnel mode \"%s\"\n", *argv); fprintf(stderr,"Unknown tunnel mode \"%s\"\n", *argv);
exit(-1); exit(-1);
} }
} else if (strcmp(*argv, "remote") == 0) { } else if (strcmp(*argv, "remote") == 0) {
inet_prefix raddr; inet_prefix raddr;
NEXT_ARG(); NEXT_ARG();
get_prefix(&raddr, *argv, preferred_family); get_prefix(&raddr, *argv, preferred_family);
@ -234,7 +234,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)
if (strchr(*argv, '.')) if (strchr(*argv, '.'))
p->i_key = p->o_key = get_addr32(*argv); p->i_key = p->o_key = get_addr32(*argv);
else { else {
if (get_unsigned(&uval, *argv, 0)<0) { if (get_unsigned(&uval, *argv, 0) < 0) {
fprintf(stderr, "invalid value of \"key\"\n"); fprintf(stderr, "invalid value of \"key\"\n");
exit(-1); exit(-1);
} }

12
ip/ipaddress.c
View File

@ -314,7 +314,8 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
} }
static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
const struct rtattr *carrier_changes) { const struct rtattr *carrier_changes)
{
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s",
s->rx_compressed ? "compressed" : "", _SL_); s->rx_compressed ? "compressed" : "", _SL_);
@ -585,7 +586,7 @@ static unsigned int get_ifa_flags(struct ifaddrmsg *ifa,
int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n, int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
void *arg) void *arg)
{ {
FILE *fp = (FILE*)arg; FILE *fp = arg;
struct ifaddrmsg *ifa = NLMSG_DATA(n); struct ifaddrmsg *ifa = NLMSG_DATA(n);
int len = n->nlmsg_len; int len = n->nlmsg_len;
int deprecated = 0; int deprecated = 0;
@ -606,7 +607,8 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (filter.flushb && n->nlmsg_type != RTM_NEWADDR) if (filter.flushb && n->nlmsg_type != RTM_NEWADDR)
return 0; return 0;
parse_rtattr(rta_tb, IFA_MAX, IFA_RTA(ifa), n->nlmsg_len - NLMSG_LENGTH(sizeof(*ifa))); parse_rtattr(rta_tb, IFA_MAX, IFA_RTA(ifa),
n->nlmsg_len - NLMSG_LENGTH(sizeof(*ifa)));
ifa_flags = get_ifa_flags(ifa, rta_tb[IFA_FLAGS]); ifa_flags = get_ifa_flags(ifa, rta_tb[IFA_FLAGS]);
@ -1295,7 +1297,7 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
struct { struct {
struct nlmsghdr n; struct nlmsghdr n;
struct ifaddrmsg ifa; struct ifaddrmsg ifa;
char buf[256]; char buf[256];
} req; } req;
char *d = NULL; char *d = NULL;
char *l = NULL; char *l = NULL;
@ -1452,7 +1454,7 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
} }
brd = peer; brd = peer;
if (brd.bitlen <= 30) { if (brd.bitlen <= 30) {
for (i=31; i>=brd.bitlen; i--) { for (i = 31; i >= brd.bitlen; i--) {
if (brd_len == -1) if (brd_len == -1)
brd.data[0] |= htonl(1<<(31-i)); brd.data[0] |= htonl(1<<(31-i));
else else

12
ip/iplink.c
View File

@ -365,16 +365,16 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
if (get_integer(&mtu, *argv, 0)) if (get_integer(&mtu, *argv, 0))
invarg("Invalid \"mtu\" value\n", *argv); invarg("Invalid \"mtu\" value\n", *argv);
addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4); addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4);
} else if (strcmp(*argv, "netns") == 0) { } else if (strcmp(*argv, "netns") == 0) {
NEXT_ARG(); NEXT_ARG();
if (netns != -1) if (netns != -1)
duparg("netns", *argv); duparg("netns", *argv);
if ((netns = get_netns_fd(*argv)) >= 0) if ((netns = get_netns_fd(*argv)) >= 0)
addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, &netns, 4); addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, &netns, 4);
else if (get_integer(&netns, *argv, 0) == 0) else if (get_integer(&netns, *argv, 0) == 0)
addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4); addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
else else
invarg("Invalid \"netns\" value\n", *argv); invarg("Invalid \"netns\" value\n", *argv);
} else if (strcmp(*argv, "multicast") == 0) { } else if (strcmp(*argv, "multicast") == 0) {
NEXT_ARG(); NEXT_ARG();
req->i.ifi_change |= IFF_MULTICAST; req->i.ifi_change |= IFF_MULTICAST;
@ -934,7 +934,7 @@ static int do_set(int argc, char **argv)
} else } else
return on_off("dynamic", *argv); return on_off("dynamic", *argv);
} else { } else {
if (strcmp(*argv, "dev") == 0) { if (strcmp(*argv, "dev") == 0) {
NEXT_ARG(); NEXT_ARG();
} }
if (matches(*argv, "help") == 0) if (matches(*argv, "help") == 0)