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

Changes performed with this Coccinelle patch:

    @@
    expression e;
    @@

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

    @@
    expression e;
    @@

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

    @@
    expression e;
    @@

    - if (e)
    	ring_free(e);

    @@
    expression e;
    @@

    - if (e != NULL)
    	ring_free(e);
---
 src/dns.c       | 3 +--
 src/resolvers.c | 6 ++----
 src/sink.c      | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/dns.c b/src/dns.c
index 8855f37f3..e5ddee71f 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -421,8 +421,7 @@ int dns_dgram_init(struct dns_nameserver *ns, struct sockaddr_storage *sk)
 	}
 	return 0;
 out:
-	if (dgram->ring_req)
-		ring_free(dgram->ring_req);
+	ring_free(dgram->ring_req);
 
 	free(dgram);
 
diff --git a/src/resolvers.c b/src/resolvers.c
index ee70e45ca..4b2e03e67 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -2484,13 +2484,11 @@ static void resolvers_destroy(struct resolvers *resolvers)
 				fd_delete(ns->dgram->conn.t.sock.fd);
 				close(ns->dgram->conn.t.sock.fd);
 			}
-			if (ns->dgram->ring_req)
-				ring_free(ns->dgram->ring_req);
+			ring_free(ns->dgram->ring_req);
 			free(ns->dgram);
 		}
 		if (ns->stream) {
-			if (ns->stream->ring_req)
-				ring_free(ns->stream->ring_req);
+			ring_free(ns->stream->ring_req);
 			task_destroy(ns->stream->task_req);
 			task_destroy(ns->stream->task_rsp);
 			free(ns->stream);
diff --git a/src/sink.c b/src/sink.c
index 55b6ad1ec..af0e89171 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -1164,8 +1164,7 @@ error:
 		free(sft);
 
 	if (sink) {
-		if (sink->ctx.ring)
-			ring_free(sink->ctx.ring);
+		ring_free(sink->ctx.ring);
 
 		LIST_DELETE(&sink->sink_list);
 		free(sink->name);