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

Merge pull request #3363 from pacovn/static_analysis__ISO_C_return_compliance

Browse Source 
bgpd isisd lib: fix return on void functions
This commit is contained in:
Renato Westphal 2018-11-21 14:19:09 -02:00 committed by GitHub
commit f37bb166a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_attr.c
View File

@ -3495,8 +3495,8 @@ void bgp_packet_mpunreach_prefix(struct stream *s, struct prefix *p, afi_t afi,
num_labels = 1; num_labels = 1;
} }
return bgp_packet_mpattr_prefix(s, afi, safi, p, prd, label, num_labels, bgp_packet_mpattr_prefix(s, afi, safi, p, prd, label, num_labels,
addpath_encode, addpath_tx_id, attr); addpath_encode, addpath_tx_id, attr);
} }
void bgp_packet_mpunreach_end(struct stream *s, size_t attrlen_pnt) void bgp_packet_mpunreach_end(struct stream *s, size_t attrlen_pnt)

41
bgpd/bgp_pbr.c
View File

@ -1508,9 +1508,10 @@ static void bgp_pbr_policyroute_remove_from_zebra_recursive(
struct list *orig_list; struct list *orig_list;
struct bgp_pbr_val_mask **target_val; struct bgp_pbr_val_mask **target_val;
if (type_entry == 0) if (type_entry == 0) {
return bgp_pbr_policyroute_remove_from_zebra_unit(bgp, path, bgp_pbr_policyroute_remove_from_zebra_unit(bgp, path, bpf);
bpf); return;
}
next_type_entry = bgp_pbr_next_type_entry(type_entry); next_type_entry = bgp_pbr_next_type_entry(type_entry);
if (type_entry == FLOWSPEC_TCP_FLAGS && bpof->tcpflags) { if (type_entry == FLOWSPEC_TCP_FLAGS && bpof->tcpflags) {
orig_list = bpof->tcpflags; orig_list = bpof->tcpflags;
@ -1530,8 +1531,9 @@ static void bgp_pbr_policyroute_remove_from_zebra_recursive(
bgp_pbr_icmp_action(bgp, path, bpf, bpof, false, NULL, NULL); bgp_pbr_icmp_action(bgp, path, bpf, bpof, false, NULL, NULL);
return; return;
} else { } else {
return bgp_pbr_policyroute_remove_from_zebra_recursive( bgp_pbr_policyroute_remove_from_zebra_recursive(
bgp, path, bpf, bpof, next_type_entry); bgp, path, bpf, bpof, next_type_entry);
return;
} }
for (ALL_LIST_ELEMENTS(orig_list, node, nnode, valmask)) { for (ALL_LIST_ELEMENTS(orig_list, node, nnode, valmask)) {
*target_val = valmask; *target_val = valmask;
@ -1544,9 +1546,10 @@ static void bgp_pbr_policyroute_remove_from_zebra(
struct bgp *bgp, struct bgp_path_info *path, struct bgp_pbr_filter *bpf, struct bgp *bgp, struct bgp_path_info *path, struct bgp_pbr_filter *bpf,
struct bgp_pbr_or_filter *bpof) struct bgp_pbr_or_filter *bpof)
{ {
if (!bpof) if (!bpof) {
return bgp_pbr_policyroute_remove_from_zebra_unit(bgp, path, bgp_pbr_policyroute_remove_from_zebra_unit(bgp, path, bpf);
bpf); return;
}
if (bpof->tcpflags) if (bpof->tcpflags)
bgp_pbr_policyroute_remove_from_zebra_recursive( bgp_pbr_policyroute_remove_from_zebra_recursive(
bgp, path, bpf, bpof, FLOWSPEC_TCP_FLAGS); bgp, path, bpf, bpof, FLOWSPEC_TCP_FLAGS);
@ -1903,9 +1906,10 @@ static void bgp_pbr_policyroute_add_to_zebra_recursive(
struct list *orig_list; struct list *orig_list;
struct bgp_pbr_val_mask **target_val; struct bgp_pbr_val_mask **target_val;
if (type_entry == 0) if (type_entry == 0) {
return bgp_pbr_policyroute_add_to_zebra_unit(bgp, path, bpf, nh, bgp_pbr_policyroute_add_to_zebra_unit(bgp, path, bpf, nh, rate);
rate); return;
}
next_type_entry = bgp_pbr_next_type_entry(type_entry); next_type_entry = bgp_pbr_next_type_entry(type_entry);
if (type_entry == FLOWSPEC_TCP_FLAGS && bpof->tcpflags) { if (type_entry == FLOWSPEC_TCP_FLAGS && bpof->tcpflags) {
orig_list = bpof->tcpflags; orig_list = bpof->tcpflags;
@ -1925,8 +1929,9 @@ static void bgp_pbr_policyroute_add_to_zebra_recursive(
bgp_pbr_icmp_action(bgp, path, bpf, bpof, true, nh, rate); bgp_pbr_icmp_action(bgp, path, bpf, bpof, true, nh, rate);
return; return;
} else { } else {
return bgp_pbr_policyroute_add_to_zebra_recursive( bgp_pbr_policyroute_add_to_zebra_recursive(
bgp, path, bpf, bpof, nh, rate, next_type_entry); bgp, path, bpf, bpof, nh, rate, next_type_entry);
return;
} }
for (ALL_LIST_ELEMENTS(orig_list, node, nnode, valmask)) { for (ALL_LIST_ELEMENTS(orig_list, node, nnode, valmask)) {
*target_val = valmask; *target_val = valmask;
@ -1941,9 +1946,10 @@ static void bgp_pbr_policyroute_add_to_zebra(struct bgp *bgp,
struct bgp_pbr_or_filter *bpof, struct bgp_pbr_or_filter *bpof,
struct nexthop *nh, float *rate) struct nexthop *nh, float *rate)
{ {
if (!bpof) if (!bpof) {
return bgp_pbr_policyroute_add_to_zebra_unit(bgp, path, bpf, nh, bgp_pbr_policyroute_add_to_zebra_unit(bgp, path, bpf, nh, rate);
rate); return;
}
if (bpof->tcpflags) if (bpof->tcpflags)
bgp_pbr_policyroute_add_to_zebra_recursive( bgp_pbr_policyroute_add_to_zebra_recursive(
bgp, path, bpf, bpof, nh, rate, FLOWSPEC_TCP_FLAGS); bgp, path, bpf, bpof, nh, rate, FLOWSPEC_TCP_FLAGS);
@ -2112,9 +2118,10 @@ static void bgp_pbr_handle_entry(struct bgp *bgp, struct bgp_path_info *path,
bpf.protocol = proto; bpf.protocol = proto;
bpf.src_port = srcp; bpf.src_port = srcp;
bpf.dst_port = dstp; bpf.dst_port = dstp;
if (!add) if (!add) {
return bgp_pbr_policyroute_remove_from_zebra(bgp, path, &bpf, bgp_pbr_policyroute_remove_from_zebra(bgp, path, &bpf, &bpof);
&bpof); return;
}
/* no action for add = true */ /* no action for add = true */
for (i = 0; i < api->action_num; i++) { for (i = 0; i < api->action_num; i++) {
switch (api->actions[i].action) { switch (api->actions[i].action) {

27
bgpd/bgp_zebra.c
View File

@ -1217,9 +1217,10 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
if (bgp_debug_zebra(p)) if (bgp_debug_zebra(p))
prefix2str(p, buf_prefix, sizeof(buf_prefix)); prefix2str(p, buf_prefix, sizeof(buf_prefix));
if (safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC) {
return bgp_pbr_update_entry(bgp, &rn->p, bgp_pbr_update_entry(bgp, &rn->p, info, afi, safi, true);
info, afi, safi, true); return;
}
/* /*
* vrf leaking support (will have only one nexthop) * vrf leaking support (will have only one nexthop)
@ -1505,8 +1506,8 @@ void bgp_zebra_withdraw(struct prefix *p, struct bgp_path_info *info,
if (safi == SAFI_FLOWSPEC) { if (safi == SAFI_FLOWSPEC) {
peer = info->peer; peer = info->peer;
return bgp_pbr_update_entry(peer->bgp, p, bgp_pbr_update_entry(peer->bgp, p, info, AFI_IP, safi, false);
info, AFI_IP, safi, false); return;
} }
memset(&api, 0, sizeof(api)); memset(&api, 0, sizeof(api));
@ -2501,19 +2502,19 @@ static void bgp_zebra_process_local_ip_prefix(int cmd, struct zclient *zclient,
if (cmd == ZEBRA_IP_PREFIX_ROUTE_ADD) { if (cmd == ZEBRA_IP_PREFIX_ROUTE_ADD) {
if (p.family == AF_INET) if (p.family == AF_INET)
return bgp_evpn_advertise_type5_route( bgp_evpn_advertise_type5_route(bgp_vrf, &p, NULL,
bgp_vrf, &p, NULL, AFI_IP, SAFI_UNICAST); AFI_IP, SAFI_UNICAST);
else else
return bgp_evpn_advertise_type5_route( bgp_evpn_advertise_type5_route(bgp_vrf, &p, NULL,
bgp_vrf, &p, NULL, AFI_IP6, SAFI_UNICAST); AFI_IP6, SAFI_UNICAST);
} else { } else {
if (p.family == AF_INET) if (p.family == AF_INET)
return bgp_evpn_withdraw_type5_route( bgp_evpn_withdraw_type5_route(bgp_vrf, &p, AFI_IP,
bgp_vrf, &p, AFI_IP, SAFI_UNICAST); SAFI_UNICAST);
else else
return bgp_evpn_withdraw_type5_route( bgp_evpn_withdraw_type5_route(bgp_vrf, &p, AFI_IP6,
bgp_vrf, &p, AFI_IP6, SAFI_UNICAST); SAFI_UNICAST);
} }
} }

2
isisd/isis_route.c
View File

@ -492,7 +492,7 @@ static void _isis_route_verify_table(struct isis_area *area,
void isis_route_verify_table(struct isis_area *area, struct route_table *table) void isis_route_verify_table(struct isis_area *area, struct route_table *table)
{ {
return _isis_route_verify_table(area, table, NULL); _isis_route_verify_table(area, table, NULL);
} }
/* Function to validate route tables for L1L2 areas. In this case we can't use /* Function to validate route tables for L1L2 areas. In this case we can't use

2
lib/agg_table.h
View File

@ -58,7 +58,7 @@ static inline struct agg_node *agg_lock_node(struct agg_node *node)
static inline void agg_unlock_node(struct agg_node *node) static inline void agg_unlock_node(struct agg_node *node)
{ {
return route_unlock_node(agg_node_to_rnode(node)); route_unlock_node(agg_node_to_rnode(node));
} }
static inline void agg_set_table_info(struct agg_table *atable, void *data) static inline void agg_set_table_info(struct agg_table *atable, void *data)

8
lib/openbsd-tree.h
View File

@ -475,25 +475,25 @@ int _rb_check(const struct rb_type *, void *, unsigned long);
__attribute__((__unused__)) static inline void _name##_RB_SET_LEFT( \ __attribute__((__unused__)) static inline void _name##_RB_SET_LEFT( \
struct _type *elm, struct _type *left) \ struct _type *elm, struct _type *left) \
{ \ { \
return _rb_set_left(_name##_RB_TYPE, elm, left); \ _rb_set_left(_name##_RB_TYPE, elm, left); \
} \ } \
\ \
__attribute__((__unused__)) static inline void _name##_RB_SET_RIGHT( \ __attribute__((__unused__)) static inline void _name##_RB_SET_RIGHT( \
struct _type *elm, struct _type *right) \ struct _type *elm, struct _type *right) \
{ \ { \
return _rb_set_right(_name##_RB_TYPE, elm, right); \ _rb_set_right(_name##_RB_TYPE, elm, right); \
} \ } \
\ \
__attribute__((__unused__)) static inline void _name##_RB_SET_PARENT( \ __attribute__((__unused__)) static inline void _name##_RB_SET_PARENT( \
struct _type *elm, struct _type *parent) \ struct _type *elm, struct _type *parent) \
{ \ { \
return _rb_set_parent(_name##_RB_TYPE, elm, parent); \ _rb_set_parent(_name##_RB_TYPE, elm, parent); \
} \ } \
\ \
__attribute__((__unused__)) static inline void _name##_RB_POISON( \ __attribute__((__unused__)) static inline void _name##_RB_POISON( \
struct _type *elm, unsigned long poison) \ struct _type *elm, unsigned long poison) \
{ \ { \
return _rb_poison(_name##_RB_TYPE, elm, poison); \ _rb_poison(_name##_RB_TYPE, elm, poison); \
} \ } \
\ \
__attribute__((__unused__)) static inline int _name##_RB_CHECK( \ __attribute__((__unused__)) static inline int _name##_RB_CHECK( \