summaryrefslogtreecommitdiffstats
path: root/zebra/zebra_fpm.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2017-05-05 23:55:29 +0200
committerQuentin Young <qlyoung@cumulusnetworks.com>2017-05-09 22:44:23 +0200
commitd9090d56c0d7cf1f93d844e764aa669fab0c355e (patch)
tree515887503cd9e8e1c4f1443a5dcec7b8f2343374 /zebra/zebra_fpm.c
parent*: update thread_add_* calls (diff)
downloadfrr-d9090d56c0d7cf1f93d844e764aa669fab0c355e.tar.xz
frr-d9090d56c0d7cf1f93d844e764aa669fab0c355e.zip
ospf6d, zebra: remove unnecessary asserts
These pointers are now guaranteed to be null, so asserting the opposite will crash. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_fpm.c')
-rw-r--r--zebra/zebra_fpm.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index e8fa6e116..cf8f78afe 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -535,7 +535,6 @@ zfpm_conn_up_thread_cb (struct thread *thread)
zfpm_rnodes_iter_t *iter;
rib_dest_t *dest;
- assert (zfpm_g->t_conn_up);
zfpm_g->t_conn_up = NULL;
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->t_conn_down);
zfpm_g->t_conn_down = NULL;
iter = &zfpm_g->t_conn_down_state.iter;
@@ -758,7 +756,6 @@ zfpm_read_cb (struct thread *thread)
fpm_msg_hdr_t *hdr;
zfpm_g->stats.read_cb_calls++;
- assert (zfpm_g->t_read);
zfpm_g->t_read = NULL;
/*
@@ -1047,7 +1044,6 @@ zfpm_write_cb (struct thread *thread)
int num_writes;
zfpm_g->stats.write_cb_calls++;
- assert (zfpm_g->t_write);
zfpm_g->t_write = NULL;
/*
@@ -1139,7 +1135,6 @@ zfpm_connect_cb (struct thread *t)
int sock, ret;
struct sockaddr_in serv;
- assert (zfpm_g->t_connect);
zfpm_g->t_connect = NULL;
assert (zfpm_g->state == ZFPM_STATE_ACTIVE);
@@ -1390,7 +1385,6 @@ zfpm_trigger_update (struct route_node *rn, const char *reason)
static int
zfpm_stats_timer_cb (struct thread *t)
{
- assert (zfpm_g->t_stats);
zfpm_g->t_stats = NULL;
/*