GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: fix size_t handling 

libcbfs was using printf for size_t typed variables. However, printf
did not support printing those. This patch fixes the issue, removing
the warning when compiling ram_media.c

libcbfs/ram_media.c:52:10: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat]
libcbfs/ram_media.c:52:10: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int' [-Wformat]

Change-Id: Iaf6e723f9a5b0a61a39d3125036fee9853e37ba8
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2904
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2013-03-25 15:13:20 -07:00 committed by Ronald G. Minnich
parent a6c495edca
commit e21f5e1483
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
payloads/libpayload/libc/printf.c
View File

@ -552,6 +552,9 @@ static int printf_core(const char *fmt, struct printf_spec *ps, va_list ap)
qualifier = PrintfQualifierByte; qualifier = PrintfQualifierByte;
} }
break; break;
case 'z': /* size_t or ssize_t */
qualifier = PrintfQualifierLong;
break;
case 'l': /* long or long long */ case 'l': /* long or long long */
qualifier = PrintfQualifierLong; qualifier = PrintfQualifierLong;
if (fmt[i] == 'l') { if (fmt[i] == 'l') {

2
payloads/libpayload/libcbfs/ram_media.c
View File

@ -48,7 +48,7 @@ static void *ram_map(struct cbfs_media *media, size_t offset, size_t count) {
offset = m->size + offset; offset = m->size + offset;
} }
if (offset + count > m->size) { if (offset + count > m->size) {
printf("ERROR: ram_map: request out of range (0x%x+0x%x)\n", printf("ERROR: ram_map: request out of range (0x%zx+0x%zx)\n",
offset, count); offset, count);
return NULL; return NULL;
} }