From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [RFC iproute2-next 10/16] iproute: whitespace fixes Date: Thu, 1 Feb 2018 17:19:40 -0800 Message-ID: <20180202011946.21929-11-sthemmin@microsoft.com> References: <20180202011946.21929-1-sthemmin@microsoft.com> Cc: netdev@vger.kernel.org, Stephen Hemminger , Stephen Hemminger To: dsahern@gmail.com Return-path: Received: from mail-pl0-f66.google.com ([209.85.160.66]:47028 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbeBBBUQ (ORCPT ); Thu, 1 Feb 2018 20:20:16 -0500 Received: by mail-pl0-f66.google.com with SMTP id 36so4922929ple.13 for ; Thu, 01 Feb 2018 17:20:16 -0800 (PST) In-Reply-To: <20180202011946.21929-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org List-ID: Add whitespace arount operators for consistency. Signed-off-by: Stephen Hemminger --- ip/iproute.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/ip/iproute.c b/ip/iproute.c index a9842cfc8205..b466f9eb8cad 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -163,7 +163,7 @@ static int filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len) if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN) ip6_multiple_tables = 1; - if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED)) + if (filter.cloned == !(r->rtm_flags & RTM_F_CLONED)) return 0; if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) { @@ -565,7 +565,8 @@ static void print_rta_multipath(FILE *fp, const struct rtmsg *r, if (nh->rtnh_len > len) break; - if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST) { + if ((r->rtm_flags & RTM_F_CLONED) && + r->rtm_type == RTN_MULTICAST) { if (first) { fprintf(fp, "Oifs: "); first = 0; @@ -593,7 +594,8 @@ static void print_rta_multipath(FILE *fp, const struct rtmsg *r, print_rta_flow(fp, tb[RTA_FLOW]); } - if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST) { + if ((r->rtm_flags & RTM_F_CLONED) && + r->rtm_type == RTN_MULTICAST) { fprintf(fp, "%s", ll_index_to_name(nh->rtnh_ifindex)); if (nh->rtnh_hops != 1) fprintf(fp, "(ttl>%d)", nh->rtnh_hops); @@ -675,7 +677,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (r->rtm_dst_len != host_len) { fprintf(fp, "%s/%u ", rt_addr_n2a_rta(family, tb[RTA_DST]), - r->rtm_dst_len); + r->rtm_dst_len); } else { fprintf(fp, "%s ", format_host_rta(family, tb[RTA_DST])); @@ -690,7 +692,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (r->rtm_src_len != host_len) { fprintf(fp, "from %s/%u ", rt_addr_n2a_rta(family, tb[RTA_SRC]), - r->rtm_src_len); + r->rtm_src_len); } else { fprintf(fp, "from %s ", format_host_rta(family, tb[RTA_SRC])); @@ -721,7 +723,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (table && (table != RT_TABLE_MAIN || show_details > 0) && !filter.tb) fprintf(fp, "table %s ", rtnl_rttable_n2a(table, b1, sizeof(b1))); - if (!(r->rtm_flags&RTM_F_CLONED)) { + if (!(r->rtm_flags & RTM_F_CLONED)) { if ((r->rtm_protocol != RTPROT_BOOT || show_details > 0) && filter.protocolmask != -1) fprintf(fp, "proto %s ", rtnl_rtprot_n2a(r->rtm_protocol, b1, sizeof(b1))); if ((r->rtm_scope != RT_SCOPE_UNIVERSE || show_details > 0) && filter.scopemask != -1) @@ -763,7 +765,6 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) print_rta_cacheinfo(fp, RTA_DATA(tb[RTA_CACHEINFO])); } else if (r->rtm_family == AF_INET6) { - if (r->rtm_flags & RTM_F_CLONED) fprintf(fp, "%s cache ", _SL_); @@ -1576,8 +1577,8 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action) invarg("invalid mark value", *argv); filter.markmask = -1; } else if (matches(*argv, "metric") == 0 || - matches(*argv, "priority") == 0 || - strcmp(*argv, "preference") == 0) { + matches(*argv, "priority") == 0 || + strcmp(*argv, "preference") == 0) { __u32 metric; NEXT_ARG(); @@ -2116,6 +2117,8 @@ int do_iproute(int argc, char **argv) return iproute_showdump(); if (matches(*argv, "help") == 0) usage(); - fprintf(stderr, "Command \"%s\" is unknown, try \"ip route help\".\n", *argv); + + fprintf(stderr, + "Command \"%s\" is unknown, try \"ip route help\".\n", *argv); exit(-1); } -- 2.15.1