提交 adc5669b 编写于 作者: O openharmony_ci 提交者: Gitee

!60 【轻量级 PR】:fatfs.c避免不同配置下`未使用变量`编译错误

Merge pull request !60 from laokz/N/A
...@@ -348,8 +348,6 @@ int fatfs_bind(struct inode *blkdriver, const void *data, void **handle, const c ...@@ -348,8 +348,6 @@ int fatfs_bind(struct inode *blkdriver, const void *data, void **handle, const c
los_part *part = NULL; los_part *part = NULL;
char drive[DRIVER_NAME_LEN]; char drive[DRIVER_NAME_LEN];
struct FatfsMountOpts opts = {0}; struct FatfsMountOpts opts = {0};
struct inode_search_s desc;
FAR struct inode *inode;
FatParseOptions((char *)data, &opts); FatParseOptions((char *)data, &opts);
...@@ -424,6 +422,8 @@ int fatfs_bind(struct inode *blkdriver, const void *data, void **handle, const c ...@@ -424,6 +422,8 @@ int fatfs_bind(struct inode *blkdriver, const void *data, void **handle, const c
free(dir); free(dir);
#ifdef LOSCFG_FS_FAT_VIRTUAL_PARTITION #ifdef LOSCFG_FS_FAT_VIRTUAL_PARTITION
/* Parent Partition Mount Success, then process virtual partition mount operation */ /* Parent Partition Mount Success, then process virtual partition mount operation */
struct inode_search_s desc;
FAR struct inode *inode;
if (result == FR_OK) { if (result == FR_OK) {
if (fat->fs_type != FS_FAT32) if (fat->fs_type != FS_FAT32)
return VIRERR_NOTFIT; return VIRERR_NOTFIT;
...@@ -472,8 +472,6 @@ int fatfs_unbind(void *handle, struct inode **blkdriver) ...@@ -472,8 +472,6 @@ int fatfs_unbind(void *handle, struct inode **blkdriver)
INT result; INT result;
los_part *part = NULL; los_part *part = NULL;
char drive[DRIVER_NAME_LEN]; char drive[DRIVER_NAME_LEN];
struct inode_search_s desc;
FAR struct inode *inode;
fat = (FATFS *)handle; fat = (FATFS *)handle;
if (fat == NULL) if (fat == NULL)
...@@ -487,6 +485,8 @@ int fatfs_unbind(void *handle, struct inode **blkdriver) ...@@ -487,6 +485,8 @@ int fatfs_unbind(void *handle, struct inode **blkdriver)
#ifdef LOSCFG_FS_FAT_VIRTUAL_PARTITION #ifdef LOSCFG_FS_FAT_VIRTUAL_PARTITION
/* Release virtual partition objects before unbind real partition */ /* Release virtual partition objects before unbind real partition */
struct inode_search_s desc;
FAR struct inode *inode;
SETUP_SEARCH(&desc, g_fatVirPart.virtualinfo.devpartpath, false); SETUP_SEARCH(&desc, g_fatVirPart.virtualinfo.devpartpath, false);
FatfsVirtLock(); FatfsVirtLock();
result = FatFsUnbindVirPart(fat); result = FatFsUnbindVirPart(fat);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册