Merge pull request #9763 from ton31337/fix/more_thread_null

More struct thread null

10 files changed, 0 insertions, 25 deletions

diff --git a/isisd/fabricd.c b/isisd/fabricd.c
index 0f10a1516a..2937df992c 100644
--- a/isisd/fabricd.c
+++ b/isisd/fabricd.c
@@ -258,7 +258,6 @@ static int fabricd_initial_sync_timeout(struct thread *thread)
 		  f->initial_sync_circuit->interface->name);
 	f->initial_sync_state = FABRICD_SYNC_PENDING;
 	f->initial_sync_circuit = NULL;
-	f->initial_sync_timeout = NULL;
 	return 0;
 }
 
@@ -403,7 +402,6 @@ static uint8_t fabricd_calculate_fabric_tier(struct isis_area *area)
 static int fabricd_tier_set_timer(struct thread *thread)
 {
 	struct fabricd *f = THREAD_ARG(thread);
-	f->tier_set_timer = NULL;
 
 	fabricd_set_tier(f, f->tier_pending);
 	return 0;
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 45e89897ff..5718b48b9d 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -1840,7 +1840,6 @@ static int isis_run_spf_cb(struct thread *thread)
 	int have_run = 0;
 
 	XFREE(MTYPE_ISIS_SPF_RUN, run);
-	area->spf_timer[level - 1] = NULL;
 
 	if (!(area->is_type & level)) {
 		if (IS_DEBUG_SPF_EVENTS)
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 733f4ba1fb..cd2791fc48 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -204,7 +204,6 @@ int ospf6_orig_as_external_lsa(struct thread *thread)
 	uint32_t type, adv_router;
 
 	oi = (struct ospf6_interface *)THREAD_ARG(thread);
-	oi->thread_as_extern_lsa = NULL;
 
 	if (oi->state == OSPF6_INTERFACE_DOWN)
 		return 0;
@@ -1091,8 +1090,6 @@ static int ospf6_asbr_routemap_update_timer(struct thread *thread)
 	struct ospf6_redist *red;
 	int type;
 
-	ospf6->t_distribute_update = NULL;
-
 	for (type = 0; type < ZEBRA_ROUTE_MAX; type++) {
 		red = ospf6_redist_lookup(ospf6, type, 0);
 
@@ -3372,7 +3369,6 @@ static int ospf6_asbr_summary_process(struct thread *thread)
 	struct ospf6 *ospf6 = THREAD_ARG(thread);
 	int operation = 0;
 
-	ospf6->t_external_aggr = NULL;
 	operation = ospf6->aggr_action;
 
 	if (IS_OSPF6_DEBUG_AGGR)
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c
index ad8998b1ed..78f842db6c 100644
--- a/ospf6d/ospf6_gr_helper.c
+++ b/ospf6d/ospf6_gr_helper.c
@@ -202,8 +202,6 @@ static int ospf6_handle_grace_timer_expiry(struct thread *thread)
 {
 	struct ospf6_neighbor *nbr = THREAD_ARG(thread);
 
-	nbr->gr_helper_info.t_grace_timer = NULL;
-
 	ospf6_gr_helper_exit(nbr, OSPF6_GR_HELPER_GRACE_TIMEOUT);
 	return OSPF6_SUCCESS;
 }
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index 2d82ff7ce8..6abc1c7d09 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -248,7 +248,6 @@ int ospf6_router_lsa_originate(struct thread *thread)
 	int count;
 
 	oa = (struct ospf6_area *)THREAD_ARG(thread);
-	oa->thread_router_lsa = NULL;
 
 	if (oa->ospf6->gr_info.restart_in_progress) {
 		if (IS_DEBUG_OSPF6_GR)
@@ -533,7 +532,6 @@ int ospf6_network_lsa_originate(struct thread *thread)
 	uint16_t type;
 
 	oi = (struct ospf6_interface *)THREAD_ARG(thread);
-	oi->thread_network_lsa = NULL;
 
 	/* The interface must be enabled until here. A Network-LSA of a
 	   disabled interface (but was once enabled) should be flushed
@@ -784,7 +782,6 @@ int ospf6_link_lsa_originate(struct thread *thread)
 	struct ospf6_prefix *op;
 
 	oi = (struct ospf6_interface *)THREAD_ARG(thread);
-	oi->thread_link_lsa = NULL;
 
 	assert(oi->area);
 
@@ -1030,7 +1027,6 @@ int ospf6_intra_prefix_lsa_originate_stub(struct thread *thread)
 	int ls_id = 0;
 
 	oa = (struct ospf6_area *)THREAD_ARG(thread);
-	oa->thread_intra_prefix_lsa = NULL;
 
 	if (oa->ospf6->gr_info.restart_in_progress) {
 		if (IS_DEBUG_OSPF6_GR)
@@ -1269,7 +1265,6 @@ int ospf6_intra_prefix_lsa_originate_transit(struct thread *thread)
 	uint16_t type;
 
 	oi = (struct ospf6_interface *)THREAD_ARG(thread);
-	oi->thread_intra_prefix_lsa = NULL;
 
 	assert(oi->area);
 
diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c
index 809768fb5c..c2e9b7f28a 100644
--- a/ospf6d/ospf6_nssa.c
+++ b/ospf6d/ospf6_nssa.c
@@ -1168,8 +1168,6 @@ static int ospf6_abr_task_timer(struct thread *thread)
 {
 	struct ospf6 *ospf6 = THREAD_ARG(thread);
 
-	ospf6->t_abr_task = NULL;
-
 	if (IS_OSPF6_DEBUG_ABR)
 		zlog_debug("Running ABR task on timer");
 
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 6fe7055202..9e3bb4895a 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -432,7 +432,6 @@ static struct ospf6 *ospf6_create(const char *name)
 
 	o->rt_aggr_tbl = route_table_init();
 	o->aggr_delay_interval = OSPF6_EXTL_AGGR_DEFAULT_DELAY;
-	o->t_external_aggr = NULL;
 	o->aggr_action = OSPF6_ROUTE_AGGR_NONE;
 
 	o->fd = -1;
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index a89e90bf70..4670316db4 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -580,7 +580,6 @@ register_opaque_info_per_type(struct ospf_opaque_functab *functab,
 	oipt->lsa_type = new->data->type;
 	oipt->opaque_type = GET_OPAQUE_TYPE(ntohl(new->data->id.s_addr));
 	oipt->status = PROC_NORMAL;
-	oipt->t_opaque_lsa_self = NULL;
 	oipt->functab = functab;
 	functab->oipt = oipt;
 	oipt->id_list = list_new();
@@ -705,7 +704,6 @@ register_opaque_info_per_id(struct opaque_info_per_type *oipt,
 		       sizeof(struct opaque_info_per_id));
 
 	oipi->opaque_id = GET_OPAQUE_ID(ntohl(new->data->id.s_addr));
-	oipi->t_opaque_lsa_self = NULL;
 	oipi->opqctl_type = oipt;
 	oipi->lsa = ospf_lsa_lock(new);
 
@@ -1857,7 +1855,6 @@ static int ospf_opaque_type9_lsa_reoriginate_timer(struct thread *t)
 	int rc = -1;
 
 	oipt = THREAD_ARG(t);
-	oipt->t_opaque_lsa_self = NULL;
 
 	if ((functab = oipt->functab) == NULL
 	    || functab->lsa_originator == NULL) {
@@ -1909,7 +1906,6 @@ static int ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t)
 	int n, rc = -1;
 
 	oipt = THREAD_ARG(t);
-	oipt->t_opaque_lsa_self = NULL;
 
 	if ((functab = oipt->functab) == NULL
 	    || functab->lsa_originator == NULL) {
@@ -1963,7 +1959,6 @@ static int ospf_opaque_type11_lsa_reoriginate_timer(struct thread *t)
 	int rc = -1;
 
 	oipt = THREAD_ARG(t);
-	oipt->t_opaque_lsa_self = NULL;
 
 	if ((functab = oipt->functab) == NULL
 	    || functab->lsa_originator == NULL) {
@@ -2079,7 +2074,6 @@ static int ospf_opaque_lsa_refresh_timer(struct thread *t)
 		zlog_debug("Timer[Opaque-LSA]: (Opaque-LSA Refresh expire)");
 
 	oipi = THREAD_ARG(t);
-	oipi->t_opaque_lsa_self = NULL;
 
 	if ((lsa = oipi->lsa) != NULL)
 		if ((functab = oipi->opqctl_type->functab) != NULL)
diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c
index 0ae9761b11..1756d87a6f 100644
--- a/tests/lib/test_timer_correctness.c
+++ b/tests/lib/test_timer_correctness.c
@@ -153,7 +153,6 @@ int main(int argc, char **argv)
 
 		XFREE(MTYPE_TMP, timers[index]->arg);
 		thread_cancel(&timers[index]);
-		timers[index] = NULL;
 		timers_pending--;
 	}
 
diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c
index 23c044c7c1..f9d634b6a6 100644
--- a/tests/lib/test_timer_performance.c
+++ b/tests/lib/test_timer_performance.c
@@ -77,7 +77,6 @@ int main(int argc, char **argv)
 
 		index = prng_rand(prng) % SCHEDULE_TIMERS;
 		thread_cancel(&timers[index]);
-		timers[index] = NULL;
 	}
 
 	monotime(&tv_stop);