CLEANUP: Stop checking the pointer before calling `pool_free()`

Changes performed with this Coccinelle patch:

    @@
    expression e;
    expression p;
    @@

    - if (e != NULL) {
    	pool_free(p, e);
    - }

    @@
    expression e;
    expression p;
    @@

    - if (e) {
    	pool_free(p, e);
    - }

    @@
    expression e;
    expression p;
    @@

    - if (e)
    	pool_free(p, e);

    @@
    expression e;
    expression p;
    @@

    - if (e != NULL)
    	pool_free(p, e);

diff --git a/src/dns.c b/src/dns.c
index a48eadd62091fbac3a060092920be4adca40bb14..b103c860232a34417708248efc480dd57d76ed42 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -777,10 +777,8 @@ void dns_queries_flush(struct dns_session *ds)
 
 void dns_session_free(struct dns_session *ds)
 {
-       if (ds->rx_msg.area)
-               pool_free(dns_msg_buf, ds->rx_msg.area);
-       if (ds->tx_ring_area)
-               pool_free(dns_msg_buf, ds->tx_ring_area);
+       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);
 
@@ -1084,10 +1082,8 @@ struct dns_session *dns_session_new(struct dns_stream_server *dss)
 error:
        if (ds->task_exp)
                task_destroy(ds->task_exp);
-       if (ds->rx_msg.area)
-               pool_free(dns_msg_buf, ds->rx_msg.area);
-       if (ds->tx_ring_area)
-               pool_free(dns_msg_buf, ds->tx_ring_area);
+       pool_free(dns_msg_buf, ds->rx_msg.area);
+       pool_free(dns_msg_buf, ds->tx_ring_area);
 
        pool_free(dns_session_pool, ds);
 

diff --git a/src/event_hdl.c b/src/event_hdl.c
index 5637741089e84b8c9dbc5f25cdca4a6b0df031b3..e2f01241e8f21bdcc43a2b0f9493cf00f680c72e 100644 (file)
--- a/src/event_hdl.c
+++ b/src/event_hdl.c
@@ -569,8 +569,7 @@ struct event_hdl_sub *event_hdl_subscribe_ptr(event_hdl_sub_list *sub_list,
        if (new_sub) {
                if (hdl.async == EVENT_HDL_ASYNC_MODE_NORMAL) {
                        tasklet_free(new_sub->hdl.async_task);
-                       if (task_ctx)
-                               pool_free(pool_head_sub_taskctx, task_ctx);
+                       pool_free(pool_head_sub_taskctx, task_ctx);
                }
                if (hdl.async)
                        pool_free(pool_head_sub_event, new_sub->async_end);

diff --git a/src/quic_sock.c b/src/quic_sock.c
index 196ad386d9e3977b103389fa6113cedf0abb129b..d96118c3daa9b9c161e7851378e701352cf03871 100644 (file)
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -278,8 +278,7 @@ static struct quic_dgram *quic_rxbuf_purge_dgrams(struct quic_receiver_buf *buf)
                b_del(&buf->buf, cur->len);
 
                /* Free last found unused datagram. */
-               if (prev)
-                       pool_free(pool_head_quic_dgram, prev);
+               pool_free(pool_head_quic_dgram, prev);
                prev = cur;
        }
 

diff --git a/src/resolvers.c b/src/resolvers.c
index 692099554d15560cb368f8ea57f897f7265180db..a3f328d7a74be9852b45dc14c54e9ec8dbb996bf 100644 (file)
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -1466,8 +1466,7 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
                                    tmp_record->ar_item == NULL &&
                                    memcmp(tmp_record->data.target, answer_record->name, tmp_record->data_len) == 0) {
                                        /* Always use the received additional record to refresh info */
-                                       if (tmp_record->ar_item)
-                                               pool_free(resolv_answer_item_pool, tmp_record->ar_item);
+                                       pool_free(resolv_answer_item_pool, tmp_record->ar_item);
                                        tmp_record->ar_item = answer_record;
                                        answer_record = NULL;
                                        break;