From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v2 3/7] iproute: Fix for missing 'Oifs:' display
Date: Thu, 17 Aug 2017 19:09:27 +0200 [thread overview]
Message-ID: <20170817170931.24089-4-phil@nwl.cc> (raw)
In-Reply-To: <20170817170931.24089-1-phil@nwl.cc>
Covscan complained about dead code but after reading it, I assume the
author's intention was to prefix the interface list with 'Oifs: '.
Initializing first to 1 and setting it to 0 after above prefix was
printed should fix it.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
ip/iproute.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ip/iproute.c b/ip/iproute.c
index cb695ad4141a7..89caac124f489 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -624,7 +624,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
}
if (tb[RTA_MULTIPATH]) {
struct rtnexthop *nh = RTA_DATA(tb[RTA_MULTIPATH]);
- int first = 0;
+ int first = 1;
len = RTA_PAYLOAD(tb[RTA_MULTIPATH]);
@@ -634,10 +634,12 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (nh->rtnh_len > len)
break;
if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST) {
- if (first)
+ if (first) {
fprintf(fp, "Oifs: ");
- else
+ first = 0;
+ } else {
fprintf(fp, " ");
+ }
} else
fprintf(fp, "%s\tnexthop ", _SL_);
if (nh->rtnh_len > sizeof(*nh)) {
--
2.13.1
next prev parent reply other threads:[~2017-08-17 17:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 17:09 [iproute PATCH v2 0/7] Covscan: Dead code elimination Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 1/7] devlink: No need for this self-assignment Phil Sutter
2017-08-17 19:48 ` Jiri Pirko
2017-08-18 10:20 ` Phil Sutter
2017-08-21 9:02 ` Jiri Pirko
2017-08-17 17:09 ` [iproute PATCH v2 2/7] ipntable: No need to check and assign to parms_rta Phil Sutter
2017-08-17 17:09 ` Phil Sutter [this message]
2017-08-17 17:09 ` [iproute PATCH v2 4/7] lib/rt_names: Drop dead code in rtnl_rttable_n2a() Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 5/7] ss: Skip useless check in parse_hostcond() Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 6/7] ss: Drop useless assignment Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 7/7] tc/m_gact: Drop dead code Phil Sutter
2017-08-22 0:13 ` [iproute PATCH v2 0/7] Covscan: Dead code elimination Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170817170931.24089-4-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).