korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-15 05:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

bridge: remove trailing whitespace

Browse Source
This commit is contained in:
Stephen Hemminger 2012-10-29 17:48:55 -07:00
parent 346f8ca814
commit 38df7ac95d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bridge/fdb.c
View File

@ -94,7 +94,7 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
ll_index_to_type(r->ndm_ifindex), ll_index_to_type(r->ndm_ifindex),
b1, sizeof(b1))); b1, sizeof(b1)));
} }
if (!filter_index && r->ndm_ifindex) if (!filter_index && r->ndm_ifindex)
fprintf(fp, "dev %s ", ll_index_to_name(r->ndm_ifindex)); fprintf(fp, "dev %s ", ll_index_to_name(r->ndm_ifindex));
@ -106,7 +106,7 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
RTA_DATA(tb[NDA_DST]), RTA_DATA(tb[NDA_DST]),
abuf, sizeof(abuf))); abuf, sizeof(abuf)));
} }
if (show_stats && tb[NDA_CACHEINFO]) { if (show_stats && tb[NDA_CACHEINFO]) {
struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]); struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]);
int hz = get_user_hz(); int hz = get_user_hz();
@ -194,7 +194,7 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
req.ndm.ndm_flags |= NTF_SELF; req.ndm.ndm_flags |= NTF_SELF;
} else if (matches(*argv, "master") == 0) { } else if (matches(*argv, "master") == 0) {
req.ndm.ndm_flags |= NTF_MASTER; req.ndm.ndm_flags |= NTF_MASTER;
} else if (matches(*argv, "local") == 0|| } else if (matches(*argv, "local") == 0||
matches(*argv, "permanent") == 0) { matches(*argv, "permanent") == 0) {
req.ndm.ndm_state |= NUD_PERMANENT; req.ndm.ndm_state |= NUD_PERMANENT;
} else if (matches(*argv, "temp") == 0) { } else if (matches(*argv, "temp") == 0) {

12
bridge/link.c
View File

@ -57,7 +57,7 @@ static void print_link_flags(FILE *fp, unsigned flags)
} }
static const char *oper_states[] = { static const char *oper_states[] = {
"UNKNOWN", "NOTPRESENT", "DOWN", "LOWERLAYERDOWN", "UNKNOWN", "NOTPRESENT", "DOWN", "LOWERLAYERDOWN",
"TESTING", "DORMANT", "UP" "TESTING", "DORMANT", "UP"
}; };
@ -100,17 +100,17 @@ int print_linkinfo(const struct sockaddr_nl *who,
fprintf(fp, "%d: %s ", ifi->ifi_index, fprintf(fp, "%d: %s ", ifi->ifi_index,
tb[IFLA_IFNAME] ? (char*)RTA_DATA(tb[IFLA_IFNAME]) : "<nil>"); tb[IFLA_IFNAME] ? (char*)RTA_DATA(tb[IFLA_IFNAME]) : "<nil>");
if (tb[IFLA_OPERSTATE]) if (tb[IFLA_OPERSTATE])
print_operstate(fp, *(__u8 *)RTA_DATA(tb[IFLA_OPERSTATE])); print_operstate(fp, *(__u8 *)RTA_DATA(tb[IFLA_OPERSTATE]));
if (tb[IFLA_LINK]) { if (tb[IFLA_LINK]) {
SPRINT_BUF(b1); SPRINT_BUF(b1);
int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]); int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]);
if (iflink == 0) if (iflink == 0)
fprintf(fp, "@NONE: "); fprintf(fp, "@NONE: ");
else { else {
fprintf(fp, "@%s: ", fprintf(fp, "@%s: ",
if_indextoname(iflink, b1)); if_indextoname(iflink, b1));
} }
} else { } else {
@ -123,7 +123,7 @@ int print_linkinfo(const struct sockaddr_nl *who,
fprintf(fp, "mtu %u ", *(int*)RTA_DATA(tb[IFLA_MTU])); fprintf(fp, "mtu %u ", *(int*)RTA_DATA(tb[IFLA_MTU]));
if (tb[IFLA_MASTER]) { if (tb[IFLA_MASTER]) {
fprintf(fp, "master %s ", fprintf(fp, "master %s ",
if_indextoname(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1)); if_indextoname(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1));
} }

2
bridge/monitor.c
View File

@ -74,7 +74,7 @@ int accept_msg(const struct sockaddr_nl *who,
default: default:
return 0; return 0;
} }
} }