From fe83f589068d8cd90ea63fabadd60408ae80cce1 Mon Sep 17 00:00:00 2001
From: Tim Duesterhus <tim@bastelstu.be>
Date: Sat, 22 Apr 2023 17:47:34 +0200
Subject: [PATCH] CLEANUP: Stop checking the pointer before calling
 `task_free()`

Changes performed with this Coccinelle patch:

    @@
    expression e;
    @@

    - if (e != NULL) {
    	task_destroy(e);
    - }

    @@
    expression e;
    @@

    - if (e) {
    	task_destroy(e);
    - }

    @@
    expression e;
    @@

    - if (e)
    	task_destroy(e);

    @@
    expression e;
    @@

    - if (e != NULL)
    	task_destroy(e);
---
 src/connection.c | 3 +--
 src/dns.c        | 6 ++----
 src/hlua.c       | 3 +--
 src/mworker.c    | 3 +--
 src/resolvers.c  | 6 ++----
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 29197ad94..f8a0a4215 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2451,8 +2451,7 @@ static void deinit_idle_conns(void)
 	int i;
 
 	for (i = 0; i < global.nbthread; i++) {
-		if (idle_conns[i].cleanup_task)
-			task_destroy(idle_conns[i].cleanup_task);
+		task_destroy(idle_conns[i].cleanup_task);
 	}
 }
 REGISTER_POST_DEINIT(deinit_idle_conns);
diff --git a/src/dns.c b/src/dns.c
index b103c8602..8855f37f3 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -779,8 +779,7 @@ void dns_session_free(struct dns_session *ds)
 {
 	pool_free(dns_msg_buf, ds->rx_msg.area);
 	pool_free(dns_msg_buf, ds->tx_ring_area);
-	if (ds->task_exp)
-		task_destroy(ds->task_exp);
+	task_destroy(ds->task_exp);
 
 	dns_queries_flush(ds);
 
@@ -1080,8 +1079,7 @@ struct dns_session *dns_session_new(struct dns_stream_server *dss)
 	return ds;
 
 error:
-	if (ds->task_exp)
-		task_destroy(ds->task_exp);
+	task_destroy(ds->task_exp);
 	pool_free(dns_msg_buf, ds->rx_msg.area);
 	pool_free(dns_msg_buf, ds->tx_ring_area);
 
diff --git a/src/hlua.c b/src/hlua.c
index 5c29bc5ac..a758f627f 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -9257,8 +9257,7 @@ static struct event_hdl_sub *hlua_event_subscribe(event_hdl_sub_list *list, stru
 
  mem_error:
 	if (hlua_sub) {
-		if (hlua_sub->task)
-			task_destroy(hlua_sub->task);
+		task_destroy(hlua_sub->task);
 		if (hlua_sub->hlua)
 			hlua_ctx_destroy(hlua_sub->hlua);
 		pool_free(pool_head_hlua_event_sub, hlua_sub);
diff --git a/src/mworker.c b/src/mworker.c
index 11d61a236..b1115cc6e 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -502,8 +502,7 @@ void mworker_cleanlisteners()
 		/* disable this peer section so that it kills itself */
 		if (curpeers->sighandler)
 			signal_unregister_handler(curpeers->sighandler);
-		if (curpeers->sync_task)
-			task_destroy(curpeers->sync_task);
+		task_destroy(curpeers->sync_task);
 		curpeers->sync_task = NULL;
 		curpeers->peers_fe = NULL;
 	}
diff --git a/src/resolvers.c b/src/resolvers.c
index a3f328d7a..ee70e45ca 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -2491,10 +2491,8 @@ static void resolvers_destroy(struct resolvers *resolvers)
 		if (ns->stream) {
 			if (ns->stream->ring_req)
 				ring_free(ns->stream->ring_req);
-			if (ns->stream->task_req)
-				task_destroy(ns->stream->task_req);
-			if (ns->stream->task_rsp)
-				task_destroy(ns->stream->task_rsp);
+			task_destroy(ns->stream->task_req);
+			task_destroy(ns->stream->task_rsp);
 			free(ns->stream);
 		}
 		LIST_DEL_INIT(&ns->list);