proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-30 00:56:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospf6d, zebra: remove unnecessary asserts

Browse Source 
These pointers are now guaranteed to be null, so asserting the opposite
will crash.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-05-05 21:55:29 +00:00
parent 66e78ae64b
commit d9090d56c0
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ospf6d/ospf6_lsa.c
View File

@ -696,7 +696,6 @@ ospf6_lsa_refresh (struct thread *thread)
struct ospf6_lsa *old, *self, *new; struct ospf6_lsa *old, *self, *new;
struct ospf6_lsdb *lsdb_self; struct ospf6_lsdb *lsdb_self;
assert (thread);
old = (struct ospf6_lsa *) THREAD_ARG (thread); old = (struct ospf6_lsa *) THREAD_ARG (thread);
assert (old && old->header); assert (old && old->header);

6
zebra/zebra_fpm.c
View File

@ -535,7 +535,6 @@ zfpm_conn_up_thread_cb (struct thread *thread)
zfpm_rnodes_iter_t *iter; zfpm_rnodes_iter_t *iter;
rib_dest_t *dest; rib_dest_t *dest;
assert (zfpm_g->t_conn_up);
zfpm_g->t_conn_up = NULL; zfpm_g->t_conn_up = NULL;
iter = &zfpm_g->t_conn_up_state.iter; iter = &zfpm_g->t_conn_up_state.iter;
@ -655,7 +654,6 @@ zfpm_conn_down_thread_cb (struct thread *thread)
assert (zfpm_g->state == ZFPM_STATE_IDLE); assert (zfpm_g->state == ZFPM_STATE_IDLE);
assert (zfpm_g->t_conn_down);
zfpm_g->t_conn_down = NULL; zfpm_g->t_conn_down = NULL;
iter = &zfpm_g->t_conn_down_state.iter; iter = &zfpm_g->t_conn_down_state.iter;
@ -758,7 +756,6 @@ zfpm_read_cb (struct thread *thread)
fpm_msg_hdr_t *hdr; fpm_msg_hdr_t *hdr;
zfpm_g->stats.read_cb_calls++; zfpm_g->stats.read_cb_calls++;
assert (zfpm_g->t_read);
zfpm_g->t_read = NULL; zfpm_g->t_read = NULL;
/* /*
@ -1047,7 +1044,6 @@ zfpm_write_cb (struct thread *thread)
int num_writes; int num_writes;
zfpm_g->stats.write_cb_calls++; zfpm_g->stats.write_cb_calls++;
assert (zfpm_g->t_write);
zfpm_g->t_write = NULL; zfpm_g->t_write = NULL;
/* /*
@ -1139,7 +1135,6 @@ zfpm_connect_cb (struct thread *t)
int sock, ret; int sock, ret;
struct sockaddr_in serv; struct sockaddr_in serv;
assert (zfpm_g->t_connect);
zfpm_g->t_connect = NULL; zfpm_g->t_connect = NULL;
assert (zfpm_g->state == ZFPM_STATE_ACTIVE); assert (zfpm_g->state == ZFPM_STATE_ACTIVE);
@ -1390,7 +1385,6 @@ zfpm_trigger_update (struct route_node *rn, const char *reason)
static int static int
zfpm_stats_timer_cb (struct thread *t) zfpm_stats_timer_cb (struct thread *t)
{ {
assert (zfpm_g->t_stats);
zfpm_g->t_stats = NULL; zfpm_g->t_stats = NULL;
/* /*