kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 23:41:18 +01:00
Code Releases Activity

pkg/littlefs2/fs: fix compilation with -Wcast-align

Browse Source
This commit is contained in:
Marian Buschsieweke 2021-11-05 12:20:04 +01:00
parent 3a5a13e343
commit 78810d736c
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/littlefs2/fs/littlefs2_fs.c
View File

@ -268,10 +268,19 @@ static int _rmdir(vfs_mount_t *mountp, const char *name)
return littlefs_err_to_errno(ret);
}
static inline lfs_file_t * _get_lfs_file(vfs_file_t *f)
{
/* The buffer in `private_data` is part of a union that also contains a
* pointer, so the alignment is fine. Adding an intermediate cast to
* uintptr_t to silence -Wcast-align
*/
return (lfs_file_t *)(uintptr_t)f->private_data.buffer;
}
static int _open(vfs_file_t *filp, const char *name, int flags, mode_t mode, const char *abs_path)
{
littlefs2_desc_t *fs = filp->mp->private_data;
lfs_file_t *fp = (lfs_file_t *)&filp->private_data.buffer;
lfs_file_t *fp = _get_lfs_file(filp);
(void) abs_path;
(void) mode;
@ -313,7 +322,7 @@ static int _open(vfs_file_t *filp, const char *name, int flags, mode_t mode, con
static int _close(vfs_file_t *filp)
{
littlefs2_desc_t *fs = filp->mp->private_data;
lfs_file_t *fp = (lfs_file_t *)&filp->private_data.buffer;
lfs_file_t *fp = _get_lfs_file(filp);
mutex_lock(&fs->lock);
@ -328,7 +337,7 @@ static int _close(vfs_file_t *filp)
static ssize_t _write(vfs_file_t *filp, const void *src, size_t nbytes)
{
littlefs2_desc_t *fs = filp->mp->private_data;
lfs_file_t *fp = (lfs_file_t *)&filp->private_data.buffer;
lfs_file_t *fp = _get_lfs_file(filp);
mutex_lock(&fs->lock);
@ -344,7 +353,7 @@ static ssize_t _write(vfs_file_t *filp, const void *src, size_t nbytes)
static ssize_t _read(vfs_file_t *filp, void *dest, size_t nbytes)
{
littlefs2_desc_t *fs = filp->mp->private_data;
lfs_file_t *fp = (lfs_file_t *)&filp->private_data.buffer;
lfs_file_t *fp = _get_lfs_file(filp);
mutex_lock(&fs->lock);
@ -360,7 +369,7 @@ static ssize_t _read(vfs_file_t *filp, void *dest, size_t nbytes)
static off_t _lseek(vfs_file_t *filp, off_t off, int whence)
{
littlefs2_desc_t *fs = filp->mp->private_data;
lfs_file_t *fp = (lfs_file_t *)&filp->private_data.buffer;
lfs_file_t *fp = _get_lfs_file(filp);
mutex_lock(&fs->lock);
@ -433,11 +442,20 @@ static int _statvfs(vfs_mount_t *mountp, const char *restrict path, struct statv
return littlefs_err_to_errno(ret);
}
static inline lfs_dir_t * _get_lfs_dir(vfs_DIR *dirp)
{
/* The buffer in `private_data` is part of a union that also contains a
* pointer, so the alignment is fine. Adding an intermediate cast to
* uintptr_t to silence -Wcast-align
*/
return (lfs_dir_t *)(uintptr_t)dirp->private_data.buffer;
}
static int _opendir(vfs_DIR *dirp, const char *dirname, const char *abs_path)
{
(void)abs_path;
littlefs2_desc_t *fs = dirp->mp->private_data;
lfs_dir_t *dir = (lfs_dir_t *)&dirp->private_data.buffer;
lfs_dir_t *dir = _get_lfs_dir(dirp);
mutex_lock(&fs->lock);
@ -453,7 +471,7 @@ static int _opendir(vfs_DIR *dirp, const char *dirname, const char *abs_path)
static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
{
littlefs2_desc_t *fs = dirp->mp->private_data;
lfs_dir_t *dir = (lfs_dir_t *)&dirp->private_data.buffer;
lfs_dir_t *dir = _get_lfs_dir(dirp);
mutex_lock(&fs->lock);
@ -476,7 +494,7 @@ static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
static int _closedir(vfs_DIR *dirp)
{
littlefs2_desc_t *fs = dirp->mp->private_data;
lfs_dir_t *dir = (lfs_dir_t *)&dirp->private_data.buffer;
lfs_dir_t *dir = _get_lfs_dir(dirp);
mutex_lock(&fs->lock);