From: Stephen Hemminger Date: Tue, 30 Oct 2012 00:48:55 +0000 (-0700) Subject: bridge: remove trailing whitespace X-Git-Tag: v3.7.0~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38df7ac95d261f63980e2227f7fdd34a371c08b3;p=thirdparty%2Fiproute2.git bridge: remove trailing whitespace --- diff --git a/bridge/fdb.c b/bridge/fdb.c index 6041acc30..4ca4861a0 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -94,7 +94,7 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ll_index_to_type(r->ndm_ifindex), b1, sizeof(b1))); } - + if (!filter_index && 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]), abuf, sizeof(abuf))); } - + if (show_stats && tb[NDA_CACHEINFO]) { struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]); 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; } else if (matches(*argv, "master") == 0) { req.ndm.ndm_flags |= NTF_MASTER; - } else if (matches(*argv, "local") == 0|| + } else if (matches(*argv, "local") == 0|| matches(*argv, "permanent") == 0) { req.ndm.ndm_state |= NUD_PERMANENT; } else if (matches(*argv, "temp") == 0) { diff --git a/bridge/link.c b/bridge/link.c index 1b9541d5c..08fa366a6 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -57,7 +57,7 @@ static void print_link_flags(FILE *fp, unsigned flags) } static const char *oper_states[] = { - "UNKNOWN", "NOTPRESENT", "DOWN", "LOWERLAYERDOWN", + "UNKNOWN", "NOTPRESENT", "DOWN", "LOWERLAYERDOWN", "TESTING", "DORMANT", "UP" }; @@ -100,17 +100,17 @@ int print_linkinfo(const struct sockaddr_nl *who, fprintf(fp, "%d: %s ", ifi->ifi_index, tb[IFLA_IFNAME] ? (char*)RTA_DATA(tb[IFLA_IFNAME]) : ""); - if (tb[IFLA_OPERSTATE]) + if (tb[IFLA_OPERSTATE]) print_operstate(fp, *(__u8 *)RTA_DATA(tb[IFLA_OPERSTATE])); - + if (tb[IFLA_LINK]) { SPRINT_BUF(b1); int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]); - + if (iflink == 0) fprintf(fp, "@NONE: "); else { - fprintf(fp, "@%s: ", + fprintf(fp, "@%s: ", if_indextoname(iflink, b1)); } } else { @@ -123,7 +123,7 @@ int print_linkinfo(const struct sockaddr_nl *who, fprintf(fp, "mtu %u ", *(int*)RTA_DATA(tb[IFLA_MTU])); if (tb[IFLA_MASTER]) { - fprintf(fp, "master %s ", + fprintf(fp, "master %s ", if_indextoname(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1)); } diff --git a/bridge/monitor.c b/bridge/monitor.c index 3790a846d..2f6065529 100644 --- a/bridge/monitor.c +++ b/bridge/monitor.c @@ -74,7 +74,7 @@ int accept_msg(const struct sockaddr_nl *who, default: return 0; } - + }