This is an automated email from the ASF dual-hosted git repository.
utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git
The following commit(s) were added to refs/heads/master by this push:
new 9951119 cmd/img_mgmt/port/zephyr: off_t print format fix
9951119 is described below
commit 9951119477823e8fdd6a664605426383e027174c
Author: Jordan Yates <[email protected]>
AuthorDate: Wed Jul 15 11:22:01 2020 +1000
cmd/img_mgmt/port/zephyr: off_t print format fix
Fix print format specifier which throws warnings when minimal libc is
not used. The base type of off_t varies depending on whether minimal
libc is used. Minimal libc defines off_t as int, while
gcc-arm-eabi-2020-q2 for example defines it as a long.
The value is explicitly cast to a long and the long format specifier
used to fix the warning.
Signed-off-by: Jordan Yates <[email protected]>
---
cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
index c14727b..f41ba9a 100644
--- a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
+++ b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
@@ -333,10 +333,11 @@ img_mgmt_impl_erase_image_data(unsigned int off, unsigned
int num_bytes)
/* align requested erase size to the erase-block-size */
struct device *dev = flash_area_get_device(fa);
struct flash_pages_info page;
+ off_t page_offset = fa->fa_off + num_bytes - 1;
- rc = flash_get_page_info_by_offs(dev, fa->fa_off + num_bytes -1, &page);
+ rc = flash_get_page_info_by_offs(dev, page_offset, &page);
if (rc != 0) {
- LOG_ERR("bad offset (0x%x)", fa->fa_off + num_bytes -1);
+ LOG_ERR("bad offset (0x%lx)", (long)page_offset);
rc = MGMT_ERR_EUNKNOWN;
goto end_fa;
}
