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

Remove trailing whitespace

This commit is contained in:
Stephen Hemminger 2014-02-17 10:55:31 -08:00
parent 730d3f61d9
commit 0612519e01
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/ipaddress.c
View File

@ -125,7 +125,7 @@ static void print_link_flags(FILE *fp, unsigned flags, unsigned mdown)
} }
static const char *oper_states[] = { static const char *oper_states[] = {
"UNKNOWN", "NOTPRESENT", "DOWN", "LOWERLAYERDOWN", "UNKNOWN", "NOTPRESENT", "DOWN", "LOWERLAYERDOWN",
"TESTING", "DORMANT", "UP" "TESTING", "DORMANT", "UP"
}; };

2
ip/ipaddrlabel.c
View File

@ -133,7 +133,7 @@ static int ipaddrlabel_modify(int cmd, int argc, char **argv)
inet_prefix prefix; inet_prefix prefix;
uint32_t label = 0xffffffffUL; uint32_t label = 0xffffffffUL;
char *p = NULL; char *p = NULL;
char *l = NULL; char *l = NULL;
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
memset(&prefix, 0, sizeof(prefix)); memset(&prefix, 0, sizeof(prefix));

2
ip/iplink_vxlan.c
View File

@ -198,7 +198,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
if (!dst_port_set) { if (!dst_port_set) {
fprintf(stderr, "vxlan: destination port not specified\n" fprintf(stderr, "vxlan: destination port not specified\n"
"Will use Linux kernel default (non-standard value)\n"); "Will use Linux kernel default (non-standard value)\n");
fprintf(stderr, fprintf(stderr,
"Use 'dstport 4789' to get the IANA assigned value\n" "Use 'dstport 4789' to get the IANA assigned value\n"
"Use 'dstport 0' to get default and quiet this message\n"); "Use 'dstport 0' to get default and quiet this message\n");
} }

4
ip/ipnetns.c
View File

@ -286,7 +286,7 @@ static int netns_pids(int argc, char **argv)
} }
closedir(dir); closedir(dir);
return 0; return 0;
} }
static int netns_identify(int argc, char **argv) static int netns_identify(int argc, char **argv)
@ -359,7 +359,7 @@ static int netns_identify(int argc, char **argv)
} }
closedir(dir); closedir(dir);
return 0; return 0;
} }
static int netns_delete(int argc, char **argv) static int netns_delete(int argc, char **argv)

2
ip/iproute.c
View File

@ -837,7 +837,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
} }
if (get_time_rtt(&rtt, *argv, &raw)) if (get_time_rtt(&rtt, *argv, &raw))
invarg("\"rtt\" value is invalid\n", *argv); invarg("\"rtt\" value is invalid\n", *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT, rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT,
(raw) ? rtt : rtt * 8); (raw) ? rtt : rtt * 8);
} else if (strcmp(*argv, "rto_min") == 0) { } else if (strcmp(*argv, "rto_min") == 0) {
unsigned rto_min; unsigned rto_min;

6
ip/iptunnel.c
View File

@ -345,16 +345,16 @@ static void print_tunnel(struct ip_tunnel_parm *p)
if (p->iph.protocol == IPPROTO_IPV6 && (p->i_flags & SIT_ISATAP)) { if (p->iph.protocol == IPPROTO_IPV6 && (p->i_flags & SIT_ISATAP)) {
struct ip_tunnel_prl prl[16]; struct ip_tunnel_prl prl[16];
int i; int i;
memset(prl, 0, sizeof(prl)); memset(prl, 0, sizeof(prl));
prl[0].datalen = sizeof(prl) - sizeof(prl[0]); prl[0].datalen = sizeof(prl) - sizeof(prl[0]);
prl[0].addr = htonl(INADDR_ANY); prl[0].addr = htonl(INADDR_ANY);
if (!tnl_prl_ioctl(SIOCGETPRL, p->name, prl)) if (!tnl_prl_ioctl(SIOCGETPRL, p->name, prl))
for (i = 1; i < sizeof(prl) / sizeof(prl[0]); i++) for (i = 1; i < sizeof(prl) / sizeof(prl[0]); i++)
{ {
if (prl[i].addr != htonl(INADDR_ANY)) { if (prl[i].addr != htonl(INADDR_ANY)) {
printf(" %s %s ", printf(" %s %s ",
(prl[i].flags & PRL_DEFAULT) ? "pdr" : "pr", (prl[i].flags & PRL_DEFAULT) ? "pdr" : "pr",
format_host(AF_INET, 4, &prl[i].addr, s1, sizeof(s1))); format_host(AF_INET, 4, &prl[i].addr, s1, sizeof(s1)));
} }

4
ip/ipxfrm.c
View File

@ -357,7 +357,7 @@ void xfrm_stats_print(struct xfrm_stats *s, FILE *fp, const char *prefix)
if (prefix) if (prefix)
fputs(prefix, fp); fputs(prefix, fp);
fprintf(fp, " replay-window %u replay %u failed %u%s", fprintf(fp, " replay-window %u replay %u failed %u%s",
s->replay_window, s->replay, s->integrity_failed, _SL_); s->replay_window, s->replay, s->integrity_failed, _SL_);
} }
@ -408,7 +408,7 @@ void xfrm_lifetime_print(struct xfrm_lifetime_cfg *cfg,
if (prefix) if (prefix)
fputs(prefix, fp); fputs(prefix, fp);
fprintf(fp, " expire add: soft %llu(sec), hard %llu(sec)%s", fprintf(fp, " expire add: soft %llu(sec), hard %llu(sec)%s",
(unsigned long long) cfg->soft_add_expires_seconds, (unsigned long long) cfg->soft_add_expires_seconds,
(unsigned long long) cfg->hard_add_expires_seconds, (unsigned long long) cfg->hard_add_expires_seconds,
_SL_); _SL_);

2
ip/link_gre.c
View File

@ -233,7 +233,7 @@ get_failed:
tos = uval; tos = uval;
} else } else
tos = 1; tos = 1;
} else } else
usage(); usage();
argc--; argv++; argc--; argv++;
} }

2
ip/tunnel.c
View File

@ -121,7 +121,7 @@ int tnl_del_ioctl(const char *basedev, const char *name, void *p)
return err; return err;
} }
static int tnl_gen_ioctl(int cmd, const char *name, static int tnl_gen_ioctl(int cmd, const char *name,
void *p, int skiperr) void *p, int skiperr)
{ {
struct ifreq ifr; struct ifreq ifr;

2
ip/xfrm_state.c
View File

@ -1188,7 +1188,7 @@ static int print_sadinfo(struct nlmsghdr *n, void *arg)
fprintf(fp,"BAD SAD length returned\n"); fprintf(fp,"BAD SAD length returned\n");
return -1; return -1;
} }
si = RTA_DATA(tb[XFRMA_SAD_HINFO]); si = RTA_DATA(tb[XFRMA_SAD_HINFO]);
fprintf(fp," (buckets "); fprintf(fp," (buckets ");
fprintf(fp,"count %d", si->sadhcnt); fprintf(fp,"count %d", si->sadhcnt);