Skip to content

Commit 8dfd059

Browse files
authored
Merge pull request #24 from dongly/master
2 parents 07386a9 + a7b9410 commit 8dfd059

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

dfs_lfs.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
#include <string.h>
1111

1212
#if defined(RT_VERSION_CHECK) && (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 0, 2))
13-
#define DFS_LFS_RETURN_TYPE ssize_t
13+
#define DFS_LFS_RW_RETURN_TYPE ssize_t
14+
#define DFS_LFS_LSK_RETURN_TYPE off_t
1415
#define DFS_LFS_MKFS(dev_id, fs_name) _dfs_lfs_mkfs(dev_id, fs_name)
1516
#else
16-
#define DFS_LFS_RETURN_TYPE int
17+
#define DFS_LFS_RW_RETURN_TYPE int
18+
#define DFS_LFS_LSK_RETURN_TYPE int
1719
#define DFS_LFS_MKFS(dev_id, fs_name) _dfs_lfs_mkfs(dev_id)
1820
#endif
1921

@@ -721,7 +723,7 @@ static int _dfs_lfs_ioctl(struct dfs_file* file, int cmd, void* args)
721723
return -ENOSYS;
722724
}
723725

724-
static DFS_LFS_RETURN_TYPE _dfs_lfs_read(struct dfs_file* file, void* buf, size_t len)
726+
static DFS_LFS_RW_RETURN_TYPE _dfs_lfs_read(struct dfs_file* file, void* buf, size_t len)
725727
{
726728
lfs_ssize_t ssize;
727729
dfs_lfs_fd_t* dfs_lfs_fd;
@@ -760,7 +762,7 @@ static DFS_LFS_RETURN_TYPE _dfs_lfs_read(struct dfs_file* file, void* buf, size_
760762
}
761763

762764
#ifndef LFS_READONLY
763-
static DFS_LFS_RETURN_TYPE _dfs_lfs_write(struct dfs_file* file, const void* buf, size_t len)
765+
static DFS_LFS_RW_RETURN_TYPE _dfs_lfs_write(struct dfs_file* file, const void* buf, size_t len)
764766
{
765767
lfs_ssize_t ssize;
766768
dfs_lfs_fd_t* dfs_lfs_fd;
@@ -820,7 +822,7 @@ static int _dfs_lfs_flush(struct dfs_file* file)
820822
return _lfs_result_to_dfs(result);
821823
}
822824

823-
static DFS_LFS_RETURN_TYPE _dfs_lfs_lseek(struct dfs_file* file, rt_off_t offset)
825+
static DFS_LFS_LSK_RETURN_TYPE _dfs_lfs_lseek(struct dfs_file* file, rt_off_t offset)
824826
{
825827
dfs_lfs_fd_t* dfs_lfs_fd;
826828

0 commit comments

Comments
 (0)