summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar2019-07-19 21:04:23 +0000
committerPetr Štetiar2019-07-19 21:04:23 +0000
commit1e6c122b17a404a20327808394e922356fe9f937 (patch)
treeb7c77f1590c41ae69388003959af11cd4f8455c4
parent15df43d4e7b94bfacd25823f1c035c84e935b2ed (diff)
downloadfirmware-utils-1e6c122b17a404a20327808394e922356fe9f937.tar.gz
firmware-utils: mkfwimage: fix build failure on macOS with gcc 9
Fixes following errors: src/mkfwimage.c:279:8: error: format specifies type 'long' but the argument has type 'off_t' (aka 'long long') [-Werror,-Wformat] d->stats.st_size, ^~~~~~~~~~~~~~~~ src/mkfwimage.c:280:8: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] d->partition_length - d->stats.st_size); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/mkfwimage.c:378:6: error: format specifies type 'unsigned long' but the argument has type 'long long' [-Werror,-Wformat] d->stats.st_size - d->partition_length); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--src/mkfwimage.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mkfwimage.c b/src/mkfwimage.c
index 4365fdd..c873738 100644
--- a/src/mkfwimage.c
+++ b/src/mkfwimage.c
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <inttypes.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
@@ -274,7 +275,7 @@ static void print_image_info(const image_info_t* im)
for (i = 0; i < im->part_count; ++i)
{
const part_data_t* d = &im->parts[i];
- INFO(" %10s: %8ld bytes (free: %8ld)\n",
+ INFO(" %10s: %8" PRId64 " bytes (free: %8" PRId64 ")\n",
d->partition_name,
d->stats.st_size,
d->partition_length - d->stats.st_size);
@@ -373,7 +374,7 @@ static int validate_image_layout(image_info_t* im)
return -3;
}
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 %" PRId64 " bytes)\n",
d->filename, i, d->partition_length,
d->stats.st_size - d->partition_length);
return -4;