diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-11-05 08:25:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 08:25:40 -0500 |
| commit | f52e45dbdb529e1a24d1dc43586ed50f9785d194 (patch) | |
| tree | 128df243a9c353a594c0a4f5a1ca759324140acd | |
| parent | 40ef77c7029ef49526eaec78f3eb73873bc8910a (diff) | |
| parent | 9ea714e1436fad8b19253fe695ca5178e659b662 (diff) | |
Merge pull request #7459 from donaldsharp/clang_more_stuff_to_cleanup
Clang more stuff to cleanup
| -rw-r--r-- | ospfd/ospf_asbr.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 3 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index 639f9cb35e..94fa1b5b44 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -416,7 +416,7 @@ static void ospf_aggr_handle_external_info(void *data) aggr = ospf_external_aggr_match(ospf, &ei->p); if (aggr) { - lsa = ospf_originate_summary_lsa(ospf, aggr, ei); + (void)ospf_originate_summary_lsa(ospf, aggr, ei); return; } @@ -424,7 +424,7 @@ static void ospf_aggr_handle_external_info(void *data) if (lsa) ospf_external_lsa_refresh(ospf, lsa, ei, LSA_REFRESH_FORCE, 1); else - lsa = ospf_external_lsa_originate(ospf, ei); + (void)ospf_external_lsa_originate(ospf, ei); } static void ospf_aggr_unlink_external_info(void *data) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index cfdcde9914..28ee4db3a1 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -11361,8 +11361,7 @@ DEFUN (show_ip_ospf_external_aggregator, return CMD_SUCCESS; } - ret = ospf_show_summary_address(vty, ospf, use_vrf, json, uj, - detail); + ospf_show_summary_address(vty, ospf, use_vrf, json, uj, detail); } else { /* Default Vrf */ diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index df0e22b40c..ab7d2845e7 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1766,9 +1766,11 @@ DEFPY (show_route, if (vrf_name) VRF_GET_ID(vrf_id, vrf_name, !!json); vrf = vrf_lookup_by_id(vrf_id); - if (vrf) - zvrf = vrf->info; - if (!vrf || !zvrf) + if (!vrf) + return CMD_SUCCESS; + + zvrf = vrf->info; + if (!zvrf) return CMD_SUCCESS; if (table_all) |