Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-13 01:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix the printf warning after off_t change

Browse source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: Id46daa2ee690a73d3187b479f0e7ab0e2e361764
This commit is contained in:
Xiang Xiao 2021-07-21 15:27:36 +08:00 • committed by Jiuzhu Dong
parent 6c9ea8d293
commit 030d496728
15 changed files with 119 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

20
fs/spiffs/src/spiffs_core.c
View file

@ -1570,7 +1570,7 @@ void spiffs_fobj_event(FAR struct spiffs_s *fs,
if (ev != SPIFFS_EV_NDXDEL)
{
finfo("Setting objid=%d (offset=%" PRIu32 ") objhdr_pgndx "
finfo("Setting objid=%d (offset=%" PRIuOFF ") objhdr_pgndx "
"to %04x size=%" PRIu32 "\n",
fobj->objid, fobj->offset, new_pgndx, new_size);
@ -1737,8 +1737,8 @@ ssize_t spiffs_fobj_append(FAR struct spiffs_s *fs,
int ret = OK;
int ret2;
finfo("Append %zu bytes @ offs=%jd of size=%jd\n",
len, (intmax_t)offset, (intmax_t)fobj->size);
finfo("Append %zu bytes @ offs=%" PRIdOFF " of size=%" PRIdOFF "\n",
len, offset, fobj->size);
if (offset > fobj->size)
{
@ -1891,9 +1891,9 @@ ssize_t spiffs_fobj_append(FAR struct spiffs_s *fs,
return ret;
}
finfo("objid=%04x store new size I %jd in objhdr, "
"%04x:%04x, nwritten=%zu\n",
fobj->objid, (intmax_t)(offset + nwritten),
finfo("objid=%04x store new size I %" PRIdOFF
" in objhdr, %04x:%04x, nwritten=%zu\n",
fobj->objid, offset + nwritten,
new_objhdr_page, 0,
nwritten);
}
@ -2008,7 +2008,7 @@ ssize_t spiffs_fobj_append(FAR struct spiffs_s *fs,
}
finfo("objid=%04x found object index at "
"page=%04x [fobj size=%" PRIu32 "]\n",
"page=%04x [fobj size=%" PRIuOFF "]\n",
fobj->objid, pgndx, fobj->size);
ret = spiffs_cache_read(fs,
@ -2200,9 +2200,9 @@ ssize_t spiffs_fobj_append(FAR struct spiffs_s *fs,
offset + nwritten,
&new_objhdr_page);
finfo("objid=%04x store new size II %jd in objhdr, %04x:%04x, "
"nwritten=%zu, ret=%d\n",
fobj->objid, (intmax_t)(offset + nwritten),
finfo("objid=%04x store new size II %" PRIdOFF
" in objhdr, %04x:%04x, nwritten=%zu, ret=%d\n",
fobj->objid, offset + nwritten,
new_objhdr_page, 0, nwritten,
ret2);

2
fs/spiffs/src/spiffs_gc.c
View file

@ -1186,7 +1186,7 @@ int spiffs_gc_check(FAR struct spiffs_s *fs, off_t len)
spiffs_gcinfo("#%d: run gc free_blocks=%" PRIu32 " pfree="
"%" PRIu32 " pallo=%" PRIu32 " pdele=%" PRIu32 ""
" [%" PRIu32 "] len=%" PRIu32 " of %" PRIu32 "\n",
" [%" PRIu32 "] len=%" PRIuOFF " of %" PRIu32 "\n",
tries, fs->free_blocks, free_pages,
fs->alloc_pages, fs->deleted_pages,
(free_pages + fs->alloc_pages + fs->deleted_pages),