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

Merge pull request #5911 from ton31337/fix/no_check_if_assert

Browse Source 
bgpd: Remove a test and return statement after assert
This commit is contained in:
Quentin Young 2020-03-05 13:16:30 -05:00 committed by GitHub
commit fbb0740683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_route.c
View File

@ -122,8 +122,6 @@ struct bgp_node *bgp_afi_node_get(struct bgp_table *table, afi_t afi,
struct bgp_node *prn = NULL; struct bgp_node *prn = NULL;
assert(table); assert(table);
if (!table)
return NULL;
if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP) if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP)
|| (safi == SAFI_EVPN)) { || (safi == SAFI_EVPN)) {
@ -4909,8 +4907,6 @@ void bgp_static_update(struct bgp *bgp, struct prefix *p,
#endif #endif
assert(bgp_static); assert(bgp_static);
if (!bgp_static)
return;
rn = bgp_afi_node_get(bgp->rib[afi][safi], afi, safi, p, NULL); rn = bgp_afi_node_get(bgp->rib[afi][safi], afi, safi, p, NULL);

2
bgpd/bgp_updgrp_packet.c
View File

@ -330,8 +330,6 @@ void bpacket_queue_remove_peer(struct peer_af *paf)
q = PAF_PKTQ(paf); q = PAF_PKTQ(paf);
assert(q); assert(q);
if (!q)
return;
LIST_REMOVE(paf, pkt_train); LIST_REMOVE(paf, pkt_train);
paf->next_pkt_to_send = NULL; paf->next_pkt_to_send = NULL;

2
bgpd/bgpd.c
View File

@ -1200,8 +1200,6 @@ struct peer *peer_new(struct bgp *bgp)
/* bgp argument is absolutely required */ /* bgp argument is absolutely required */
assert(bgp); assert(bgp);
if (!bgp)
return NULL;
/* Allocate new peer. */ /* Allocate new peer. */
peer = XCALLOC(MTYPE_BGP_PEER, sizeof(struct peer)); peer = XCALLOC(MTYPE_BGP_PEER, sizeof(struct peer));

7
scripts/coccinelle/test_after_assert.cocci Normal file
View File

@ -0,0 +1,7 @@
@@
identifier i;
@@
assert(i);
- if (!i)
- return ...;