leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: cbfs: Fix handling of invalid type

Browse Source 
The comment for file_cbfs_type() says that it returns 0 for an invalid type.
The code appears to check for -1, except that it uses an unsigned variable
to store the type. This results in a warning on 64-bit machines.

Adjust it to make the meaning clearer. Continue to handle the -1 case since
it may be needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Simon Glass 2016-02-29 15:25:49 -07:00
parent 3e8bd46950
commit a696d768c1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/cbfs.c
View File

@ -103,7 +103,7 @@ int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
printf(" size type name\n"); printf(" size type name\n");
printf("------------------------------------------\n"); printf("------------------------------------------\n");
while (file) { while (file) {
u32 type = file_cbfs_type(file); int type = file_cbfs_type(file);
char *type_name = NULL; char *type_name = NULL;
const char *filename = file_cbfs_name(file); const char *filename = file_cbfs_name(file);
@ -140,7 +140,8 @@ int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
case CBFS_COMPONENT_CMOS_LAYOUT: case CBFS_COMPONENT_CMOS_LAYOUT:
type_name = "cmos layout"; type_name = "cmos layout";
break; break;
case -1UL: case -1:
case 0:
type_name = "null"; type_name = "null";
break; break;
} }