EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

firmware-utils: mkfwimage: fix more errors

Browse Source 
Fix 4 errors reported by gcc 9

3 mismatched format type errors
1 unused variable error

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2019-07-19 16:54:17 +01:00
parent 9401780c2c
commit 90b7dbf7d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/firmware-utils/src/mkfwimage.c
View File

@ -273,7 +273,7 @@ static void print_image_info(const image_info_t* im)
for (i = 0; i < im->part_count; ++i) for (i = 0; i < im->part_count; ++i)
{ {
const part_data_t* d = &im->parts[i]; const part_data_t* d = &im->parts[i];
INFO(" %10s: %8ld bytes (free: %8ld)\n", INFO(" %10s: %8lld bytes (free: %8lld)\n",
d->partition_name, d->partition_name,
d->stats.st_size, d->stats.st_size,
d->partition_length - d->stats.st_size); d->partition_length - d->stats.st_size);
@ -295,7 +295,7 @@ static u_int32_t filelength(const char* file)
return (ret); return (ret);
} }
static int create_image_layout(const char* kernelfile, const char* rootfsfile, char* board_name, image_info_t* im) static int create_image_layout(const char* kernelfile, const char* rootfsfile, image_info_t* im)
{ {
uint32_t rootfs_len = 0; uint32_t rootfs_len = 0;
part_data_t* kernel = &im->parts[0]; part_data_t* kernel = &im->parts[0];
@ -372,7 +372,7 @@ static int validate_image_layout(image_info_t* im)
return -3; return -3;
} }
if (d->stats.st_size > d->partition_length) { if (d->stats.st_size > d->partition_length) {
ERROR("File '%s' too big (%d) - max size: 0x%08X (exceeds %lu bytes)\n", ERROR("File '%s' too big (%d) - max size: 0x%08X (exceeds %llu bytes)\n",
d->filename, i, d->partition_length, d->filename, i, d->partition_length,
d->stats.st_size - d->partition_length); d->stats.st_size - d->partition_length);
return -4; return -4;
@ -526,7 +526,7 @@ int main(int argc, char* argv[])
im.fwinfo = fwinfo; im.fwinfo = fwinfo;
if ((rc = create_image_layout(kernelfile, rootfsfile, board_name, &im)) != 0) if ((rc = create_image_layout(kernelfile, rootfsfile, &im)) != 0)
{ {
ERROR("Failed creating firmware layout description - error code: %d\n", rc); ERROR("Failed creating firmware layout description - error code: %d\n", rc);
return -3; return -3;