diff mbox series

board: ti: common: Fix pointer-bool-conversion warnings

Message ID 20200604194508.1898-1-trini@konsulko.com
State Accepted
Delegated to: Lokesh Vutla
Headers show
Series board: ti: common: Fix pointer-bool-conversion warnings | expand

Commit Message

Tom Rini June 4, 2020, 7:45 p.m. UTC
When building this code with clang-10 a number of warnings will be
generated along the lines of:
warning: address of array 'ep->version' will always evaluate to 'true'

Convert these checks to checking the strlen of the part of the array we
care about.  As this array will be null terminated previously by us,
this is safe.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/ti/common/board_detect.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Lokesh Vutla June 5, 2020, 4:34 a.m. UTC | #1
On 05/06/20 1:15 am, Tom Rini wrote:
> When building this code with clang-10 a number of warnings will be
> generated along the lines of:
> warning: address of array 'ep->version' will always evaluate to 'true'
> 
> Convert these checks to checking the strlen of the part of the array we
> care about.  As this array will be null terminated previously by us,
> this is safe.
> 
> Cc: Lokesh Vutla <lokeshvutla@ti.com>> Signed-off-by: Tom Rini <trini@konsulko.com>

Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh
Lokesh Vutla June 18, 2020, 1:51 p.m. UTC | #2
On 05/06/20 1:15 am, Tom Rini wrote:
> When building this code with clang-10 a number of warnings will be
> generated along the lines of:
> warning: address of array 'ep->version' will always evaluate to 'true'
> 
> Convert these checks to checking the strlen of the part of the array we
> care about.  As this array will be null terminated previously by us,
> this is safe.
> 
> Cc: Lokesh Vutla <lokeshvutla@ti.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot-ti next.

Thanks and regards,
Lokesh
diff mbox series

Patch

diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 429668404a3b..e09ecda4d7e6 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -669,17 +669,17 @@  void __maybe_unused set_board_info_env(char *name)
 
 	if (name)
 		env_set("board_name", name);
-	else if (ep->name)
+	else if (strlen(ep->name) != 0)
 		env_set("board_name", ep->name);
 	else
 		env_set("board_name", unknown);
 
-	if (ep->version)
+	if (strlen(ep->version) != 0)
 		env_set("board_rev", ep->version);
 	else
 		env_set("board_rev", unknown);
 
-	if (ep->serial)
+	if (strlen(ep->serial) != 0)
 		env_set("board_serial", ep->serial);
 	else
 		env_set("board_serial", unknown);
@@ -692,22 +692,22 @@  void __maybe_unused set_board_info_env_am6(char *name)
 
 	if (name)
 		env_set("board_name", name);
-	else if (ep->name)
+	else if (strlen(ep->name) != 0)
 		env_set("board_name", ep->name);
 	else
 		env_set("board_name", unknown);
 
-	if (ep->version)
+	if (strlen(ep->version) != 0)
 		env_set("board_rev", ep->version);
 	else
 		env_set("board_rev", unknown);
 
-	if (ep->software_revision)
+	if (strlen(ep->software_revision) != 0)
 		env_set("board_software_revision", ep->software_revision);
 	else
 		env_set("board_software_revision", unknown);
 
-	if (ep->serial)
+	if (strlen(ep->serial) != 0)
 		env_set("board_serial", ep->serial);
 	else
 		env_set("board_serial", unknown);