Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
drivers/mmcsd/mmcsd_sdio.c
+1 -1
View File
@@ -2246,7 +2246,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
finfo("startsector: %" PRIu32 " nsectors: %u sectorsize: %d\n",
finfo("startsector: %" PRIuOFF " nsectors: %u sectorsize: %d\n",
startsector, nsectors, priv->blocksize);
if (nsectors > 0)
drivers/mmcsd/mmcsd_spi.c
+7 -7
View File
@@ -1167,7 +1167,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
int i;
int ret;
finfo("start_sector=%" PRIu32 " nsectors=%u\n", start_sector, nsectors);
finfo("start_sector=%" PRIuOFF " nsectors=%u\n", start_sector, nsectors);
#ifdef CONFIG_DEBUG_FEATURES
if (!buffer)
@@ -1219,12 +1219,12 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
if (IS_BLOCK(slot->type))
{
offset = start_sector;
finfo("nbytes=%zu sector offset=%jd\n", nbytes, (intmax_t)offset);
finfo("nbytes=%zu sector offset=%" PRIdOFF "\n", nbytes, offset);
}
else
{
offset = start_sector * SECTORSIZE(slot);
finfo("nbytes=%zu byte offset=%jd\n", nbytes, (intmax_t)offset);
finfo("nbytes=%zu byte offset=%" PRIdOFF "\n", nbytes, offset);
}
/* Select the slave */
@@ -1328,7 +1328,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode,
int i;
int ret;
finfo("start_sector=%" PRIu32 " nsectors=%u\n", start_sector, nsectors);
finfo("start_sector=%" PRIuOFF " nsectors=%u\n", start_sector, nsectors);
#ifdef CONFIG_DEBUG_FEATURES
if (!buffer)
@@ -1388,12 +1388,12 @@ static ssize_t mmcsd_write(FAR struct inode *inode,
if (IS_BLOCK(slot->type))
{
offset = start_sector;
finfo("nbytes=%zu sector offset=%jd\n", nbytes, (intmax_t)offset);
finfo("nbytes=%zu sector offset=%" PRIdOFF "\n", nbytes, offset);
}
else
{
offset = start_sector * SECTORSIZE(slot);
finfo("nbytes=%zu byte offset=%jd\n", nbytes, (intmax_t)offset);
finfo("nbytes=%zu byte offset=%" PRIdOFF "\n", nbytes, offset);
}
mmcsd_dumpbuffer("Write buffer", buffer, nbytes);
@@ -1594,7 +1594,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
finfo("geo_available: %d\n", geometry->geo_available);
finfo("geo_mediachanged: %d\n", geometry->geo_mediachanged);
finfo("geo_writeenabled: %d\n", geometry->geo_writeenabled);
finfo("geo_nsectors: %" PRIu32 "\n", geometry->geo_nsectors);
finfo("geo_nsectors: %" PRIuOFF "\n", geometry->geo_nsectors);
finfo("geo_sectorsize: %" PRIi16 "\n", geometry->geo_sectorsize);
return OK;
drivers/mtd/ftl.c
+27 -27
View File
@@ -190,8 +190,8 @@ static ssize_t ftl_reload(FAR void *priv, FAR uint8_t *buffer,
nread = MTD_BREAD(dev->mtd, startblock, nblocks, buffer);
if (nread != nblocks)
{
ferr("ERROR: Read %zu blocks starting at block %jd failed: %zd\n",
nblocks, (intmax_t)startblock, nread);
ferr("ERROR: Read %zu blocks starting at block %" PRIdOFF
" failed: %zd\n", nblocks, startblock, nread);
}
return nread;
@@ -209,7 +209,7 @@ static ssize_t ftl_read(FAR struct inode *inode, unsigned char *buffer,
{
FAR struct ftl_struct_s *dev;
finfo("sector: %" PRIu32 " nsectors: %u\n", start_sector, nsectors);
finfo("sector: %" PRIuOFF " nsectors: %u\n", start_sector, nsectors);
DEBUGASSERT(inode && inode->i_private);
@@ -284,8 +284,8 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
nxfrd = MTD_BREAD(dev->mtd, rwblock, dev->blkper, dev->eblock);
if (nxfrd != dev->blkper)
{
ferr("ERROR: Read erase block %jd failed: %zd\n",
(intmax_t)rwblock, nxfrd);
ferr("ERROR: Read erase block %" PRIdOFF " failed: %zd\n",
rwblock, nxfrd);
return -EIO;
}
@@ -295,8 +295,8 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
ret = MTD_ERASE(dev->mtd, eraseblock, 1);
if (ret < 0)
{
ferr("ERROR: Erase block=%jd failed: %d\n",
(intmax_t)eraseblock, ret);
ferr("ERROR: Erase block=%" PRIdOFF "failed: %d\n",
eraseblock, ret);
return ret;
}
@@ -313,8 +313,8 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
nbytes = dev->geo.erasesize - offset;
}
finfo("Copy %d bytes into erase block=%jd at offset=%jd\n",
nbytes, (intmax_t)eraseblock, (intmax_t)offset);
finfo("Copy %d bytes into erase block=%" PRIdOFF
" at offset=%" PRIdOFF "\n", nbytes, eraseblock, offset);
memcpy(dev->eblock + offset, buffer, nbytes);
@@ -323,8 +323,8 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
nxfrd = MTD_BWRITE(dev->mtd, rwblock, dev->blkper, dev->eblock);
if (nxfrd != dev->blkper)
{
ferr("ERROR: Write erase block %jd failed: %zu\n",
(intmax_t)rwblock, nxfrd);
ferr("ERROR: Write erase block %" PRIdOFF " failed: %zu\n",
rwblock, nxfrd);
return -EIO;
}
@@ -352,21 +352,21 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
ret = MTD_ERASE(dev->mtd, eraseblock, 1);
if (ret < 0)
{
ferr("ERROR: Erase block=%jd failed: %d\n",
(intmax_t)eraseblock, ret);
ferr("ERROR: Erase block=%" PRIdOFF " failed: %d\n",
eraseblock, ret);
return ret;
}
/* Write a full erase back to flash */
finfo("Write %" PRId32 " bytes into erase block=%jd at offset=0\n",
dev->geo.erasesize, (intmax_t)alignedblock);
finfo("Write %" PRId32 " bytes into erase block=%" PRIdOFF
" at offset=0\n", dev->geo.erasesize, alignedblock);
nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, buffer);
if (nxfrd != dev->blkper)
{
ferr("ERROR: Write erase block %jd failed: %zu\n",
(intmax_t)alignedblock, nxfrd);
ferr("ERROR: Write erase block %" PRIdOFF " failed: %zu\n",
alignedblock, nxfrd);
return -EIO;
}
@@ -393,8 +393,8 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
nxfrd = MTD_BREAD(dev->mtd, alignedblock, dev->blkper, dev->eblock);
if (nxfrd != dev->blkper)
{
ferr("ERROR: Read erase block %jd failed: %zu\n",
(intmax_t)alignedblock, nxfrd);
ferr("ERROR: Read erase block %" PRIdOFF " failed: %zu\n",
alignedblock, nxfrd);
return -EIO;
}
@@ -404,16 +404,16 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
ret = MTD_ERASE(dev->mtd, eraseblock, 1);
if (ret < 0)
{
ferr("ERROR: Erase block=%jd failed: %d\n",
(intmax_t)eraseblock, ret);
ferr("ERROR: Erase block=%" PRIdOFF "failed: %d\n",
eraseblock, ret);
return ret;
}
/* Copy the user data at the beginning the buffered erase block */
nbytes = remaining * dev->geo.blocksize;
finfo("Copy %d bytes into erase block=%jd at offset=0\n",
nbytes, (intmax_t)alignedblock);
finfo("Copy %d bytes into erase block=%" PRIdOFF " at offset=0\n",
nbytes, alignedblock);
memcpy(dev->eblock, buffer, nbytes);
/* And write the erase back to flash */
@@ -421,8 +421,8 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, dev->eblock);
if (nxfrd != dev->blkper)
{
ferr("ERROR: Write erase block %jd failed: %zu\n",
(intmax_t)alignedblock, nxfrd);
ferr("ERROR: Write erase block %" PRIdOFF " failed: %zu\n",
alignedblock, nxfrd);
return -EIO;
}
}
@@ -443,7 +443,7 @@ static ssize_t ftl_write(FAR struct inode *inode,
{
struct ftl_struct_s *dev;
finfo("sector: %" PRIu32 " nsectors: %u\n", start_sector, nsectors);
finfo("sector: %" PRIuOFF " nsectors: %u\n", start_sector, nsectors);
DEBUGASSERT(inode && inode->i_private);
dev = (struct ftl_struct_s *)inode->i_private;
@@ -480,7 +480,7 @@ static int ftl_geometry(FAR struct inode *inode,
finfo("available: true mediachanged: false writeenabled: %s\n",
geometry->geo_writeenabled ? "true" : "false");
finfo("nsectors: %" PRIu32 " sectorsize: %u\n",
finfo("nsectors: %" PRIuOFF " sectorsize: %u\n",
geometry->geo_nsectors, geometry->geo_sectorsize);
return OK;
drivers/mtd/mtd_partition.c
+3 -2
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdlib.h>
#include <errno.h>
@@ -430,8 +431,8 @@ static int part_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
* return the sum to the caller.
*/
*ppv = (FAR void *)(base +
priv->firstblock * priv->blocksize);
*ppv = (FAR void *)(uintptr_t)
(base + priv->firstblock * priv->blocksize);
}
}
}
drivers/mtd/smart.c
+14 -13
View File
@@ -860,8 +860,8 @@ static ssize_t smart_reload(struct smart_struct_s *dev, FAR uint8_t *buffer,
nread = MTD_BREAD(dev->mtd, mtdstartblock, mtdblocks, buffer);
if (nread != mtdblocks)
{
ferr("ERROR: Read %zd blocks starting at block %jd failed: %zd\n",
nblocks, (intmax_t)startblock, nread);
ferr("ERROR: Read %zd blocks starting at block %" PRIdOFF
" failed: %zd\n", nblocks, startblock, nread);
}
return nread;
@@ -879,7 +879,8 @@ static ssize_t smart_read(FAR struct inode *inode, unsigned char *buffer,
{
FAR struct smart_struct_s *dev;
finfo("SMART: sector: %" PRIu32 " nsectors: %u\n", start_sector, nsectors);
finfo("SMART: sector: %" PRIuOFF " nsectors: %u\n",
start_sector, nsectors);
DEBUGASSERT(inode && inode->i_private);
#ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
@@ -915,7 +916,7 @@ static ssize_t smart_write(FAR struct inode *inode,
off_t mtdstartblock;
off_t mtdblockcount;
finfo("sector: %" PRIu32 " nsectors: %u\n", start_sector, nsectors);
finfo("sector: %" PRIuOFF " nsectors: %u\n", start_sector, nsectors);
DEBUGASSERT(inode && inode->i_private);
#ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
@@ -940,8 +941,8 @@ static ssize_t smart_write(FAR struct inode *inode,
mtdblockcount = nsectors * dev->mtdblkspersector;
mtdblkspererase = dev->mtdblkspersector * dev->sectorsperblk;
finfo("mtdsector: %jd mtdnsectors: %jd\n",
(intmax_t)mtdstartblock, (intmax_t)mtdblockcount);
finfo("mtdsector: %" PRIdOFF " mtdnsectors: %" PRIdOFF "\n",
mtdstartblock, mtdblockcount);
/* Start at first block to be written */
@@ -963,8 +964,8 @@ static ssize_t smart_write(FAR struct inode *inode,
ret = MTD_ERASE(dev->mtd, eraseblock, 1);
if (ret < 0)
{
ferr("ERROR: Erase block=%jd failed: %d\n",
(intmax_t)eraseblock, ret);
ferr("ERROR: Erase block=%" PRIdOFF " failed: %d\n",
eraseblock, ret);
/* Unlock the mutex if we add one */
@@ -987,15 +988,15 @@ static ssize_t smart_write(FAR struct inode *inode,
/* Try to write to the sector. */
finfo("Write MTD block %jd from offset %jd\n",
(intmax_t)nextblock, (intmax_t)offset);
finfo("Write MTD block %" PRIdOFF " from offset %" PRIdOFF "\n",
nextblock, offset);
nxfrd = MTD_BWRITE(dev->mtd, nextblock, blkstowrite, &buffer[offset]);
if (nxfrd != blkstowrite)
{
/* The block is not empty!! What to do? */
ferr("ERROR: Write block %jd failed: %zd.\n",
(intmax_t)nextblock, nxfrd);
ferr("ERROR: Write block %" PRIdOFF " failed: %zd.\n",
nextblock, nxfrd);
/* Unlock the mutex if we add one */
@@ -1046,7 +1047,7 @@ static int smart_geometry(FAR struct inode *inode, struct geometry *geometry)
finfo("available: true mediachanged: false writeenabled: %s\n",
geometry->geo_writeenabled ? "true" : "false");
finfo("nsectors: %" PRIu32 " sectorsize: %" PRIi16 "\n",
finfo("nsectors: %" PRIuOFF " sectorsize: %" PRIi16 "\n",
geometry->geo_nsectors, geometry->geo_sectorsize);
return OK;
drivers/ramdisk.c
+3 -3
View File
@@ -233,7 +233,7 @@ static ssize_t rd_read(FAR struct inode *inode, unsigned char *buffer,
DEBUGASSERT(inode && inode->i_private);
dev = (FAR struct rd_struct_s *)inode->i_private;
finfo("sector: %" PRIu32 " nsectors: %u sectorsize: %d\n",
finfo("sector: %" PRIuOFF " nsectors: %u sectorsize: %d\n",
start_sector, nsectors, dev->rd_sectsize);
if (start_sector < dev->rd_nsectors &&
@@ -267,7 +267,7 @@ static ssize_t rd_write(FAR struct inode *inode, const unsigned char *buffer,
DEBUGASSERT(inode && inode->i_private);
dev = (struct rd_struct_s *)inode->i_private;
finfo("sector: %" PRIu32 " nsectors: %u sectorsize: %d\n",
finfo("sector: %" PRIuOFF " nsectors: %u sectorsize: %d\n",
start_sector, nsectors, dev->rd_sectsize);
if (!RDFLAG_IS_WRENABLED(dev->rd_flags))
@@ -315,7 +315,7 @@ static int rd_geometry(FAR struct inode *inode, struct geometry *geometry)
finfo("available: true mediachanged: false writeenabled: %s\n",
geometry->geo_writeenabled ? "true" : "false");
finfo("nsectors: %" PRIu32 " sectorsize: %" PRIi16 "\n",
finfo("nsectors: %" PRIuOFF " sectorsize: %" PRIi16 "\n",
geometry->geo_nsectors, geometry->geo_sectorsize);
return OK;
drivers/rwbuffer.c
+6 -6
View File
@@ -540,8 +540,8 @@ int rwb_invalidate_writebuffer(FAR struct rwbuffer_s *rwb,
off_t wrbend;
off_t invend;
finfo("startblock=%jd blockcount=%zu\n",
(intmax_t)startblock, blockcount);
finfo("startblock=%" PRIdOFF " blockcount=%zu\n",
startblock, blockcount);
ret = rwb_semtake(&rwb->wrsem);
if (ret < 0)
@@ -682,8 +682,8 @@ int rwb_invalidate_readahead(FAR struct rwbuffer_s *rwb,
off_t rhbend;
off_t invend;
finfo("startblock=%jd blockcount=%zu\n",
(intmax_t)startblock, blockcount);
finfo("startblock=%" PRIdOFF " blockcount=%zu\n",
startblock, blockcount);
ret = rwb_semtake(&rwb->rhsem);
if (ret < 0)
@@ -937,7 +937,7 @@ static ssize_t rwb_read_(FAR struct rwbuffer_s *rwb, off_t startblock,
if (rwb->rhnblocks > 0)
{
off_t bufferend;
off_t bufferend;
/* How many blocks are available in this buffer? */
@@ -1125,7 +1125,7 @@ ssize_t rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock,
#ifdef CONFIG_DRVR_WRITEBUFFER
if (rwb->wrmaxblocks > 0)
{
finfo("startblock=%d wrbuffer=%p\n", startblock, wrbuffer);
finfo("startblock=%" PRIdOFF " wrbuffer=%p\n", startblock, wrbuffer);
ret = nxsem_wait(&rwb->wrsem);
if (ret < 0)
drivers/usbhost/usbhost_storage.c
+6 -5
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -2037,8 +2038,8 @@ static ssize_t usbhost_read(FAR struct inode *inode, unsigned char *buffer,
DEBUGASSERT(priv->usbclass.hport);
hport = priv->usbclass.hport;
uinfo("startsector: %" PRIu32 " nsectors: %u sectorsize: %" PRIu16 "\n",
startsector, nsectors, priv->blocksize);
uinfo("startsector: %" PRIuOFF " nsectors: %u "
"sectorsize: %" PRIu16 "\n", startsector, nsectors, priv->blocksize);
/* Check if the mass storage device is still connected */
@@ -2144,7 +2145,7 @@ static ssize_t usbhost_write(FAR struct inode *inode,
ssize_t nbytes;
int ret;
uinfo("sector: %" PRIu32 " nsectors: %u\n", startsector, nsectors);
uinfo("sector: %" PRIuOFF " nsectors: %u\n", startsector, nsectors);
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct usbhost_state_s *)inode->i_private;
@@ -2271,8 +2272,8 @@ static int usbhost_geometry(FAR struct inode *inode,
geometry->geo_sectorsize = priv->blocksize;
usbhost_givesem(&priv->exclsem);
uinfo("nsectors: %ld sectorsize: %" PRIi16 "n",
(long)geometry->geo_nsectors, geometry->geo_sectorsize);
uinfo("nsectors: %" PRIdOFF " sectorsize: %" PRIi16 "\n",
geometry->geo_nsectors, geometry->geo_sectorsize);
}
}