]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: ti: common: Fix pointer-bool-conversion warnings
authorTom Rini <trini@konsulko.com>
Thu, 4 Jun 2020 19:45:08 +0000 (15:45 -0400)
committerLokesh Vutla <lokeshvutla@ti.com>
Tue, 16 Jun 2020 11:30:02 +0000 (17:00 +0530)
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>
board/ti/common/board_detect.c

index 429668404a3b6456689441cff3745716081cb7e0..e09ecda4d7e68d456065a2426b5963f1dfffc103 100644 (file)
@@ -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);