[4/4] examples: remove unnecessary null checks

Message ID 20221109234649.331942-5-stephen@networkplumber.org (mailing list archive)
State Accepted, archived
Delegated to: Andrew Rybchenko
Headers
Series remove unnecessary null checks |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/intel-Testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS

Commit Message

Stephen Hemminger Nov. 9, 2022, 11:46 p.m. UTC
  The function rte_free() already handles NULL argument;
therefore the checks in this code are unnecessary.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 examples/distributor/main.c     |  3 +--
 examples/fips_validation/main.c | 15 +++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)
  

Comments

Brian Dooley Nov. 14, 2022, 3:43 p.m. UTC | #1
Hi Stephen,

Looks good for fips validation.

> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Wednesday, November 9, 2022 11:47 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Hunt, David
> <david.hunt@intel.com>; Dooley, Brian <brian.dooley@intel.com>
> Subject: [PATCH 4/4] examples: remove unnecessary null checks
> 
> The function rte_free() already handles NULL argument; therefore the
> checks in this code are unnecessary.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  examples/distributor/main.c     |  3 +--
>  examples/fips_validation/main.c | 15 +++++----------
>  2 files changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/examples/distributor/main.c b/examples/distributor/main.c index
> e767973ed8de..21304d661873 100644
> --- a/examples/distributor/main.c
> +++ b/examples/distributor/main.c
> @@ -1017,8 +1017,7 @@ main(int argc, char *argv[])
> 
>  	print_stats();
> 
> -	if (pd)
> -		rte_free(pd);
> +	rte_free(pd);
>  	rte_free(pr);
> 
>  	/* clean up the EAL */
> diff --git a/examples/fips_validation/main.c
> b/examples/fips_validation/main.c index 40a5b70e073b..73caaffb7e7a
> 100644
> --- a/examples/fips_validation/main.c
> +++ b/examples/fips_validation/main.c
> @@ -962,8 +962,7 @@ prepare_rsa_op(void)
>  		asym->rsa.message.data = msg.val;
>  		asym->rsa.message.length = msg.len;
> 
> -		if (vec.rsa.signature.val)
> -			rte_free(vec.rsa.signature.val);
> +		rte_free(vec.rsa.signature.val);
> 
>  		vec.rsa.signature.val = rte_zmalloc(NULL, vec.rsa.n.len, 0);
>  		vec.rsa.signature.len = vec.rsa.n.len; @@ -1011,11 +1010,9
> @@ prepare_ecdsa_op(void)
>  		asym->ecdsa.k.data = vec.ecdsa.k.val;
>  		asym->ecdsa.k.length = vec.ecdsa.k.len;
> 
> -		if (vec.ecdsa.r.val)
> -			rte_free(vec.ecdsa.r.val);
> +		rte_free(vec.ecdsa.r.val);
> 
> -		if (vec.ecdsa.s.val)
> -			rte_free(vec.ecdsa.s.val);
> +		rte_free(vec.ecdsa.s.val);
> 
>  		vec.ecdsa.r.len = info.interim_info.ecdsa_data.curve_len;
>  		vec.ecdsa.r.val = rte_zmalloc(NULL, vec.ecdsa.r.len, 0); @@ -
> 1060,11 +1057,9 @@ prepare_ecfpm_op(void)
>  	asym->ecpm.scalar.data = vec.ecdsa.pkey.val;
>  	asym->ecpm.scalar.length = vec.ecdsa.pkey.len;
> 
> -	if (vec.ecdsa.qx.val)
> -		rte_free(vec.ecdsa.qx.val);
> +	rte_free(vec.ecdsa.qx.val);
> 
> -	if (vec.ecdsa.qy.val)
> -		rte_free(vec.ecdsa.qy.val);
> +	rte_free(vec.ecdsa.qy.val);
> 
>  	vec.ecdsa.qx.len = info.interim_info.ecdsa_data.curve_len;
>  	vec.ecdsa.qx.val = rte_zmalloc(NULL, vec.ecdsa.qx.len, 0);
> --
> 2.35.1

Acked-by: Brian Dooley <brian.dooley@intel.com>
  

Patch

diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index e767973ed8de..21304d661873 100644
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -1017,8 +1017,7 @@  main(int argc, char *argv[])
 
 	print_stats();
 
-	if (pd)
-		rte_free(pd);
+	rte_free(pd);
 	rte_free(pr);
 
 	/* clean up the EAL */
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 40a5b70e073b..73caaffb7e7a 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -962,8 +962,7 @@  prepare_rsa_op(void)
 		asym->rsa.message.data = msg.val;
 		asym->rsa.message.length = msg.len;
 
-		if (vec.rsa.signature.val)
-			rte_free(vec.rsa.signature.val);
+		rte_free(vec.rsa.signature.val);
 
 		vec.rsa.signature.val = rte_zmalloc(NULL, vec.rsa.n.len, 0);
 		vec.rsa.signature.len = vec.rsa.n.len;
@@ -1011,11 +1010,9 @@  prepare_ecdsa_op(void)
 		asym->ecdsa.k.data = vec.ecdsa.k.val;
 		asym->ecdsa.k.length = vec.ecdsa.k.len;
 
-		if (vec.ecdsa.r.val)
-			rte_free(vec.ecdsa.r.val);
+		rte_free(vec.ecdsa.r.val);
 
-		if (vec.ecdsa.s.val)
-			rte_free(vec.ecdsa.s.val);
+		rte_free(vec.ecdsa.s.val);
 
 		vec.ecdsa.r.len = info.interim_info.ecdsa_data.curve_len;
 		vec.ecdsa.r.val = rte_zmalloc(NULL, vec.ecdsa.r.len, 0);
@@ -1060,11 +1057,9 @@  prepare_ecfpm_op(void)
 	asym->ecpm.scalar.data = vec.ecdsa.pkey.val;
 	asym->ecpm.scalar.length = vec.ecdsa.pkey.len;
 
-	if (vec.ecdsa.qx.val)
-		rte_free(vec.ecdsa.qx.val);
+	rte_free(vec.ecdsa.qx.val);
 
-	if (vec.ecdsa.qy.val)
-		rte_free(vec.ecdsa.qy.val);
+	rte_free(vec.ecdsa.qy.val);
 
 	vec.ecdsa.qx.len = info.interim_info.ecdsa_data.curve_len;
 	vec.ecdsa.qx.val = rte_zmalloc(NULL, vec.ecdsa.qx.len, 0);