michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dfu: fix printf formatting in img_util

Browse source 
This commit fixes following issues in printf formatting
- cast values of type off_t to long to remove warnings generated when
  compiling with Newlib and CONFIG_IMG_ERASE_PROGRESSIVELY is enabled
- cast values of type off_t always to long and not u32_t
- use 'z' modifier (as in "%zu") to print values of type size_t

Signed-off-by: Piotr Mienkowski <piotr.mienkowski@gmail.com>
This commit is contained in:
Piotr Mienkowski 2019-08-09 14:31:32 +02:00 • committed by Ioannis Glaropoulos
commit 43c4c12417
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/dfu/img_util/flash_img.c
View file

@ -46,15 +46,15 @@ static bool flash_verify(const struct flash_area *fa, off_t offset,
size = (len >= sizeof(temp)) ? sizeof(temp) : len;
rc = flash_area_read(fa, offset, &temp, size);
if (rc) {
LOG_ERR("flash_read error %d offset=0x%08x",
rc, (u32_t)offset);
LOG_ERR("flash_read error %d offset=0x%08lx",
rc, (long)offset);
break;
}
if (memcmp(data, &temp, size)) {
LOG_ERR("offset=0x%08x VERIFY FAIL. "
LOG_ERR("offset=0x%08lx VERIFY FAIL. "
"expected: 0x%08x, actual: 0x%08x",
(u32_t)offset, temp, UNALIGNED_GET(data));
(long)offset, temp, UNALIGNED_GET(data));
break;
}
len -= size;
@ -108,7 +108,8 @@ static int flash_progressive_erase(struct flash_img_context *ctx, off_t off)
} else {
if (ctx->off_last != sector.fs_off) {
ctx->off_last = sector.fs_off;
LOG_INF("Erasing sector at offset 0x%x", sector.fs_off);
LOG_INF("Erasing sector at offset 0x%08lx",
(long)sector.fs_off);
rc = flash_area_erase(ctx->flash_area, sector.fs_off,
sector.fs_size);
if (rc) {
@ -139,8 +140,8 @@ static int flash_sync(struct flash_img_context *ctx)
rc = flash_area_write(ctx->flash_area, ctx->bytes_written, ctx->buf,
CONFIG_IMG_BLOCK_BUF_SIZE);
if (rc) {
LOG_ERR("flash_write error %d offset=0x%08x", rc,
(u32_t)ctx->bytes_written);
LOG_ERR("flash_write error %d offset=0x%08zx", rc,
ctx->bytes_written);
return rc;
}