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);

diff --git a/src/dns.c b/src/dns.c
index 8855f37f3d7649c6fee4279b6ee530434a392867..e5ddee71f6e910e4e45a3b2729aa697ef1f7a821 100644 (file)
--- 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 ee70e45ca395f00d5467d410a35a9f515d0641bd..4b2e03e67717309dc0612643a05e77bf8de78a53 100644 (file)
--- 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 55b6ad1ece870258c2f5c461b025a0bdb5f6924d..af0e89171d76cd638b789c1bb4f4dc194a944c46 100644 (file)
--- 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);