proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 20:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7459 from donaldsharp/clang_more_stuff_to_cleanup

Browse Source 
Clang more stuff to cleanup
This commit is contained in:
Mark Stapp 2020-11-05 08:25:40 -05:00 committed by GitHub
commit f52e45dbdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ospfd/ospf_asbr.c
View File

@ -416,7 +416,7 @@ static void ospf_aggr_handle_external_info(void *data)
aggr = ospf_external_aggr_match(ospf, &ei->p); aggr = ospf_external_aggr_match(ospf, &ei->p);
if (aggr) { if (aggr) {
lsa = ospf_originate_summary_lsa(ospf, aggr, ei); (void)ospf_originate_summary_lsa(ospf, aggr, ei);
return; return;
} }
@ -424,7 +424,7 @@ static void ospf_aggr_handle_external_info(void *data)
if (lsa) if (lsa)
ospf_external_lsa_refresh(ospf, lsa, ei, LSA_REFRESH_FORCE, 1); ospf_external_lsa_refresh(ospf, lsa, ei, LSA_REFRESH_FORCE, 1);
else else
lsa = ospf_external_lsa_originate(ospf, ei); (void)ospf_external_lsa_originate(ospf, ei);
} }
static void ospf_aggr_unlink_external_info(void *data) static void ospf_aggr_unlink_external_info(void *data)

3
ospfd/ospf_vty.c
View File

@ -11361,8 +11361,7 @@ DEFUN (show_ip_ospf_external_aggregator,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ret = ospf_show_summary_address(vty, ospf, use_vrf, json, uj, ospf_show_summary_address(vty, ospf, use_vrf, json, uj, detail);
detail);
} else { } else {
/* Default Vrf */ /* Default Vrf */

8
zebra/zebra_vty.c
View File

@ -1766,9 +1766,11 @@ DEFPY (show_route,
if (vrf_name) if (vrf_name)
VRF_GET_ID(vrf_id, vrf_name, !!json); VRF_GET_ID(vrf_id, vrf_name, !!json);
vrf = vrf_lookup_by_id(vrf_id); vrf = vrf_lookup_by_id(vrf_id);
if (vrf) if (!vrf)
zvrf = vrf->info; return CMD_SUCCESS;
if (!vrf || !zvrf)
zvrf = vrf->info;
if (!zvrf)
return CMD_SUCCESS; return CMD_SUCCESS;
if (table_all) if (table_all)