Remove redundant NULL pointer checks before free functions
found by nullfree.cocci
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
examples/fips_validation/fips_dev_self_test.c | 18 ++++------
examples/fips_validation/fips_validation.c | 3 +-
examples/fips_validation/main.c | 36 +++++++------------
examples/ip_pipeline/cli.c | 12 +++----
examples/ip_pipeline/cryptodev.c | 6 ++--
examples/ip_pipeline/thread.c | 6 ++--
examples/l2fwd-cat/cat.c | 3 +-
examples/pipeline/thread.c | 6 ++--
examples/vhost_blk/vhost_blk.c | 3 +-
9 files changed, 31 insertions(+), 62 deletions(-)
diff --git a/examples/fips_validation/fips_dev_self_test.c
b/examples/fips_validation/fips_dev_self_test.c
index b4eab05a9851..076e9de099c0 100644
--- a/examples/fips_validation/fips_dev_self_test.c
+++ b/examples/fips_validation/fips_dev_self_test.c
@@ -1396,8 +1396,7 @@ check_aead_result(struct rte_crypto_op *op,
if (!mbuf)
return -1;
- if (op->sym->aead.aad.data)
- rte_free(op->sym->aead.aad.data);
+ rte_free(op->sym->aead.aad.data);
if (dir == self_test_dir_enc_auth_gen) {
src = vec->output.data;
@@ -1523,18 +1522,13 @@ static void
fips_dev_auto_test_uninit(uint8_t dev_id,
struct fips_dev_auto_test_env *env)
{
- if (env->mbuf)
- rte_pktmbuf_free(env->mbuf);
+ rte_pktmbuf_free(env->mbuf);
if (env->op)
rte_crypto_op_free(env->op);
- if (env->mpool)
- rte_mempool_free(env->mpool);
- if (env->op_pool)
- rte_mempool_free(env->op_pool);
- if (env->sess_pool)
- rte_mempool_free(env->sess_pool);
- if (env->sess_priv_pool)
- rte_mempool_free(env->sess_priv_pool);
+ rte_mempool_free(env->mpool);
+ rte_mempool_free(env->op_pool);
+ rte_mempool_free(env->sess_pool);
+ rte_mempool_free(env->sess_priv_pool);
rte_cryptodev_stop(dev_id);
}
diff --git a/examples/fips_validation/fips_validation.c
b/examples/fips_validation/fips_validation.c
index 52a7bf952d46..94253eaee8bf 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -344,8 +344,7 @@ fips_test_clear(void)
fclose(info.fp_rd);
if (info.fp_wr)
fclose(info.fp_wr);
- if (info.one_line_text)
- free(info.one_line_text);
+ free(info.one_line_text);
if (info.nb_vec_lines) {
uint32_t i;
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index dc40bffe7d97..e06ae37567fd 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -143,12 +143,9 @@ cryptodev_fips_validate_app_int(void)
error_exit:
rte_mempool_free(env.mpool);
- if (env.sess_mpool)
- rte_mempool_free(env.sess_mpool);
- if (env.sess_priv_mpool)
- rte_mempool_free(env.sess_priv_mpool);
- if (env.op_pool)
- rte_mempool_free(env.op_pool);
+ rte_mempool_free(env.sess_mpool);
+ rte_mempool_free(env.sess_priv_mpool);
+ rte_mempool_free(env.op_pool);
return ret;
}
@@ -523,8 +520,7 @@ prepare_data_mbufs(struct fips_val *val)
uint16_t nb_seg;
int ret = 0;
- if (env.mbuf)
- rte_pktmbuf_free(env.mbuf);
+ rte_pktmbuf_free(env.mbuf);
if (total_len > RTE_MBUF_MAX_NB_SEGS) {
RTE_LOG(ERR, USER1, "Data len %u too big\n", total_len);
@@ -598,8 +594,7 @@ prepare_data_mbufs(struct fips_val *val)
return 0;
error_exit:
- if (head)
- rte_pktmbuf_free(head);
+ rte_pktmbuf_free(head);
return ret;
}
@@ -656,8 +651,7 @@ prepare_auth_op(void)
if (ret < 0)
return ret;
- if (env.digest)
- rte_free(env.digest);
+ rte_free(env.digest);
env.digest = rte_zmalloc(NULL, vec.cipher_auth.digest.len,
RTE_CACHE_LINE_SIZE);
@@ -705,8 +699,7 @@ prepare_aead_op(void)
if (ret < 0)
return ret;
- if (env.digest)
- rte_free(env.digest);
+ rte_free(env.digest);
env.digest = rte_zmalloc(NULL, vec.aead.digest.len,
RTE_CACHE_LINE_SIZE);
if (!env.digest) {
@@ -1430,8 +1423,7 @@ fips_mct_tdes_test(void)
}
}
- if (val.val)
- free(val.val);
+ free(val.val);
return 0;
}
@@ -1510,8 +1502,7 @@ fips_mct_aes_ecb_test(void)
}
}
- if (val.val)
- free(val.val);
+ free(val.val);
return 0;
}
@@ -1619,8 +1610,7 @@ fips_mct_aes_test(void)
memcpy(vec.iv.val, val.val, AES_BLOCK_SIZE);
}
- if (val.val)
- free(val.val);
+ free(val.val);
return 0;
}
@@ -1706,8 +1696,7 @@ fips_mct_sha_test(void)
rte_free(vec.pt.val);
- if (val.val)
- free(val.val);
+ free(val.val);
return 0;
}
@@ -1851,8 +1840,7 @@ fips_test_one_file(void)
rte_free(env.digest);
env.digest = NULL;
}
- if (env.mbuf)
- rte_pktmbuf_free(env.mbuf);
+ rte_pktmbuf_free(env.mbuf);
return ret;
}
diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index 0c372675a919..c918f30e06f3 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -3773,10 +3773,8 @@ parse_free_sym_crypto_param_data(struct
rte_table_action_sym_crypto_params *p)
switch (xform[i]->type) {
case RTE_CRYPTO_SYM_XFORM_CIPHER:
- if (p->cipher_auth.cipher_iv.val)
- free(p->cipher_auth.cipher_iv.val);
- if (p->cipher_auth.cipher_iv_update.val)
- free(p->cipher_auth.cipher_iv_update.val);
+ free(p->cipher_auth.cipher_iv.val);
+ free(p->cipher_auth.cipher_iv_update.val);
break;
case RTE_CRYPTO_SYM_XFORM_AUTH:
if (p->cipher_auth.auth_iv.val)
@@ -3785,10 +3783,8 @@ parse_free_sym_crypto_param_data(struct
rte_table_action_sym_crypto_params *p)
free(p->cipher_auth.cipher_iv_update.val);
break;
case RTE_CRYPTO_SYM_XFORM_AEAD:
- if (p->aead.iv.val)
- free(p->aead.iv.val);
- if (p->aead.aad.val)
- free(p->aead.aad.val);
+ free(p->aead.iv.val);
+ free(p->aead.aad.val);
break;
default:
continue;
diff --git a/examples/ip_pipeline/cryptodev.c b/examples/ip_pipeline/cryptodev.c
index 9997d974563f..cd0f9c3d4eac 100644
--- a/examples/ip_pipeline/cryptodev.c
+++ b/examples/ip_pipeline/cryptodev.c
@@ -151,10 +151,8 @@ cryptodev_create(const char *name, struct cryptodev_params
*params)
return cryptodev;
error_exit:
- if (cryptodev->mp_create)
- rte_mempool_free(cryptodev->mp_create);
- if (cryptodev->mp_init)
- rte_mempool_free(cryptodev->mp_init);
+ rte_mempool_free(cryptodev->mp_create);
+ rte_mempool_free(cryptodev->mp_init);
free(cryptodev);
diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c
index b2e97327052f..82d5f87c384c 100644
--- a/examples/ip_pipeline/thread.c
+++ b/examples/ip_pipeline/thread.c
@@ -92,11 +92,9 @@ thread_free(void)
continue;
/* MSGQs */
- if (t->msgq_req)
- rte_ring_free(t->msgq_req);
+ rte_ring_free(t->msgq_req);
- if (t->msgq_rsp)
- rte_ring_free(t->msgq_rsp);
+ rte_ring_free(t->msgq_rsp);
}
}
diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index 502c6b32780e..77154c8b7e61 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -872,8 +872,7 @@ cat_fini(void)
#if PQOS_VERSION <= 103
memset(m_sockets, 0, sizeof(m_sockets));
#else
- if (m_sockets != NULL)
- free(m_sockets);
+ free(m_sockets);
#endif
m_sock_count = 0;
memset(m_config, 0, sizeof(m_config));
diff --git a/examples/pipeline/thread.c b/examples/pipeline/thread.c
index bf11e6144b75..5fe7eae00eb6 100644
--- a/examples/pipeline/thread.c
+++ b/examples/pipeline/thread.c
@@ -89,11 +89,9 @@ thread_free(void)
continue;
/* MSGQs */
- if (t->msgq_req)
- rte_ring_free(t->msgq_req);
+ rte_ring_free(t->msgq_req);
- if (t->msgq_rsp)
- rte_ring_free(t->msgq_rsp);
+ rte_ring_free(t->msgq_rsp);
}
}
diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c
index feadacc62ee5..2cab1e6994fe 100644
--- a/examples/vhost_blk/vhost_blk.c
+++ b/examples/vhost_blk/vhost_blk.c
@@ -849,8 +849,7 @@ static void
vhost_blk_ctrlr_destroy(struct vhost_blk_ctrlr *ctrlr)
{
if (ctrlr->bdev != NULL) {
- if (ctrlr->bdev->data != NULL)
- rte_free(ctrlr->bdev->data);
+ rte_free(ctrlr->bdev->data);
rte_free(ctrlr->bdev);
}
--
2.34.1
