yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!812 fix：iccarm下fs的编译错误 

Merge pull request !812 from Zhaotianyu/20220824iccarm_fs_fix
This commit is contained in:
openharmony_ci 2022-08-24 10:49:19 +00:00 committed by Gitee
parent 8a25f31aa4 5756d45e84
commit f5f18ca669
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/fs/littlefs/lfs_adapter.c
View File

@ -62,7 +62,7 @@ static uint32_t LfsGetStartAddr(int partition)
return INVALID_DEVICE_ADDR; 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, 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); ret = lfs_format(&lfs, &g_lfsCfg);
if (ret != 0) { if (ret != 0) {
errno = LittlefsErrno(ret); errno = LittlefsErrno(ret);
ret = LOS_NOK; ret = (int)LOS_NOK;
} }
return ret; return ret;
} }

10
components/fs/vfs/vfs_partition.c
View File

@ -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) { for (prev = g_deviceList; prev != NULL; prev = prev->dNext) {
if (strcmp(prev->dDev, dev) == 0) { if (strcmp(prev->dDev, dev) == 0) {
errno = -EEXIST; errno = -EEXIST;
return LOS_NOK; return (int)LOS_NOK;
} }
} }
if (addrArray == NULL) { if (addrArray == NULL) {
errno = -EFAULT; errno = -EFAULT;
return LOS_NOK; return (int)LOS_NOK;
} }
prev = (struct DeviceDesc *)malloc(sizeof(struct DeviceDesc)); prev = (struct DeviceDesc *)malloc(sizeof(struct DeviceDesc));
if (prev == NULL) { if (prev == NULL) {
errno = -ENOMEM; errno = -ENOMEM;
return LOS_NOK; return (int)LOS_NOK;
} }
prev->dDev = strdup(dev); prev->dDev = strdup(dev);
prev->dFsType = strdup(fsType); prev->dFsType = strdup(fsType);
@ -131,7 +131,7 @@ errout:
free(prev); free(prev);
errno = -ENOMEM; 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) && if ((fMap != NULL) && (fMap->fsMgt != NULL) &&
(fMap->fsMgt->fdisk != NULL)) { (fMap->fsMgt->fdisk != NULL)) {
ret = fMap->fsMgt->fdisk(dev, lengthArray, partNum); ret = fMap->fsMgt->fdisk(dev, lengthArray, partNum);
if (ret == LOS_NOK) { if (ret == (int)LOS_NOK) {
return ret; return ret;
} }
} }