Skip to content

fix[DFS][littlefs]: align lseek callback signature with off_t #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 1 commit into from
Jun 22, 2026
Merged

fix[DFS][littlefs]: align lseek callback signature with off_t #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions dfs_lfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@
#define DFS_LFS_FILE_FS(file) ((file)->vnode->fs)
#define DFS_LFS_READ_PARAMS DFS_LFS_FILE_STRUCT* file, void* buf, size_t len
#define DFS_LFS_WRITE_PARAMS DFS_LFS_FILE_STRUCT* file, const void* buf, size_t len
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, rt_off_t offset
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, off_t offset
#define DFS_LFS_IO_POS_PARAM RT_NULL
#define DFS_LFS_LSEEK_WHENCE SEEK_SET
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (rt_off_t)(lfs_pos))
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (off_t)(lfs_pos))
#define DFS_LFS_FS_FLAGS DFS_FS_FLAG_DEFAULT
#define DFS_LFS_REGISTER() dfs_register(&_dfs_lfs_ops)
#elif defined(RT_USING_DFS_V1)
Expand All @@ -114,10 +114,10 @@
#define DFS_LFS_FILE_FS(file) ((file)->vnode->fs)
#define DFS_LFS_READ_PARAMS DFS_LFS_FILE_STRUCT* file, void* buf, size_t len
#define DFS_LFS_WRITE_PARAMS DFS_LFS_FILE_STRUCT* file, const void* buf, size_t len
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, rt_off_t offset
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, off_t offset
#define DFS_LFS_IO_POS_PARAM RT_NULL
#define DFS_LFS_LSEEK_WHENCE SEEK_SET
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (rt_off_t)(lfs_pos))
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (off_t)(lfs_pos))
#define DFS_LFS_FS_FLAGS DFS_FS_FLAG_DEFAULT
#define DFS_LFS_REGISTER() dfs_register(&_dfs_lfs_ops)
#elif defined(RT_VERSION_CHECK) && (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 0, 0))
Expand All @@ -142,10 +142,10 @@
#define DFS_LFS_FILE_FS(file) ((file)->vnode->fs)
#define DFS_LFS_READ_PARAMS DFS_LFS_FILE_STRUCT* file, void* buf, size_t len
#define DFS_LFS_WRITE_PARAMS DFS_LFS_FILE_STRUCT* file, const void* buf, size_t len
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, rt_off_t offset
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, off_t offset
#define DFS_LFS_IO_POS_PARAM RT_NULL
#define DFS_LFS_LSEEK_WHENCE SEEK_SET
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (rt_off_t)(lfs_pos))
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (off_t)(lfs_pos))
#define DFS_LFS_FS_FLAGS DFS_FS_FLAG_DEFAULT
#define DFS_LFS_REGISTER() dfs_register(&_dfs_lfs_ops)
#else
Expand All @@ -170,10 +170,10 @@
#define DFS_LFS_FILE_FS(file) ((file)->fs)
#define DFS_LFS_READ_PARAMS DFS_LFS_FILE_STRUCT* file, void* buf, size_t len
#define DFS_LFS_WRITE_PARAMS DFS_LFS_FILE_STRUCT* file, const void* buf, size_t len
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, rt_off_t offset
#define DFS_LFS_LSEEK_PARAMS DFS_LFS_FILE_STRUCT* file, off_t offset
#define DFS_LFS_IO_POS_PARAM RT_NULL
#define DFS_LFS_LSEEK_WHENCE SEEK_SET
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (rt_off_t)(lfs_pos))
#define DFS_LFS_STORE_FILE_POS(file, pos, lfs_pos) (DFS_LFS_FILE_POS(file) = (off_t)(lfs_pos))
#define DFS_LFS_FS_FLAGS DFS_FS_FLAG_DEFAULT
#define DFS_LFS_REGISTER() dfs_register(&_dfs_lfs_ops)
#endif /* defined(RT_USING_DFS_V2) */
Expand Down Expand Up @@ -979,14 +979,14 @@ static int _dfs_lfs_ioctl(DFS_LFS_FILE_STRUCT* file, int cmd, void* args)
{
return _lfs_result_to_dfs((int)pos);
}
DFS_LFS_FILE_POS(file) = (rt_off_t)pos;
DFS_LFS_FILE_POS(file) = (off_t)pos;

pos = lfs_file_size(dfs_lfs_fd->lfs, &dfs_lfs_fd->u.file);
if (pos < 0)
{
return _lfs_result_to_dfs((int)pos);
}
DFS_LFS_FILE_SIZE(file) = (rt_off_t)pos;
DFS_LFS_FILE_SIZE(file) = (size_t)pos;

return RT_EOK;
#endif
Expand Down
Loading