From 5756d45e84ce08eff47131991a81dab88b276fc4 Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Wed, 24 Aug 2022 16:59:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dfs=E5=9C=A8iccarm?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=20close:?= =?UTF-8?q?=20#I5NXFL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: arvinzzz --- components/fs/littlefs/lfs_adapter.c | 4 ++-- components/fs/vfs/vfs_partition.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/fs/littlefs/lfs_adapter.c b/components/fs/littlefs/lfs_adapter.c index 1e80f672..1a55831d 100644 --- a/components/fs/littlefs/lfs_adapter.c +++ b/components/fs/littlefs/lfs_adapter.c @@ -62,7 +62,7 @@ static uint32_t LfsGetStartAddr(int partition) return INVALID_DEVICE_ADDR; } - return g_lfsDevice->dAddrArray[partition]; + return (uint32_t)g_lfsDevice->dAddrArray[partition]; } WEAK int littlefs_block_read(const struct lfs_config *c, lfs_block_t block, @@ -663,7 +663,7 @@ int LfsFormat(const char *partName, void *privData) ret = lfs_format(&lfs, &g_lfsCfg); if (ret != 0) { errno = LittlefsErrno(ret); - ret = LOS_NOK; + ret = (int)LOS_NOK; } return ret; } diff --git a/components/fs/vfs/vfs_partition.c b/components/fs/vfs/vfs_partition.c index f86a27f9..28acfb80 100644 --- a/components/fs/vfs/vfs_partition.c +++ b/components/fs/vfs/vfs_partition.c @@ -81,19 +81,19 @@ static int AddDevice(const char *dev, const char *fsType, int *lengthArray, int for (prev = g_deviceList; prev != NULL; prev = prev->dNext) { if (strcmp(prev->dDev, dev) == 0) { errno = -EEXIST; - return LOS_NOK; + return (int)LOS_NOK; } } if (addrArray == NULL) { errno = -EFAULT; - return LOS_NOK; + return (int)LOS_NOK; } prev = (struct DeviceDesc *)malloc(sizeof(struct DeviceDesc)); if (prev == NULL) { errno = -ENOMEM; - return LOS_NOK; + return (int)LOS_NOK; } prev->dDev = strdup(dev); prev->dFsType = strdup(fsType); @@ -131,7 +131,7 @@ errout: free(prev); errno = -ENOMEM; - return LOS_NOK; + return (int)LOS_NOK; } @@ -143,7 +143,7 @@ int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray, int if ((fMap != NULL) && (fMap->fsMgt != NULL) && (fMap->fsMgt->fdisk != NULL)) { ret = fMap->fsMgt->fdisk(dev, lengthArray, partNum); - if (ret == LOS_NOK) { + if (ret == (int)LOS_NOK) { return ret; } }