RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

pkg/spifs: silence -Wcast-align

Browse Source
This commit is contained in:
Marian Buschsieweke 2021-11-12 15:55:33 +01:00
parent 724d4f6429
commit c50c5ea436
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/spiffs/Makefile
View File

@ -8,5 +8,7 @@ include $(RIOTBASE)/pkg/pkg.mk
# Disable 'ISO C99 doesn’t support unnamed structs/unions [-Werror=pedantic]' # Disable 'ISO C99 doesn’t support unnamed structs/unions [-Werror=pedantic]'
CFLAGS += -Wno-pedantic CFLAGS += -Wno-pedantic
CFLAGS += -Wno-cast-align
all: all:
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)

13
pkg/spiffs/fs/spiffs_fs.c
View File

@ -355,10 +355,17 @@ static int _fstat(vfs_file_t *filp, struct stat *buf)
return spiffs_err_to_errno(ret); return spiffs_err_to_errno(ret);
} }
static spiffs_DIR * _get_spifs_dir(vfs_DIR *dirp)
{
/* the private buffer is part of a union that also contains a
* void pointer, hence, it is naturally aligned */
return (spiffs_DIR *)(uintptr_t)&dirp->private_data.buffer[0];
}
static int _opendir(vfs_DIR *dirp, const char *dirname, const char *abs_path) static int _opendir(vfs_DIR *dirp, const char *dirname, const char *abs_path)
{ {
spiffs_desc_t *fs_desc = dirp->mp->private_data; spiffs_desc_t *fs_desc = dirp->mp->private_data;
spiffs_DIR *d = (spiffs_DIR *)&dirp->private_data.buffer[0]; spiffs_DIR *d = _get_spifs_dir(dirp);
(void) abs_path; (void) abs_path;
spiffs_DIR *res = SPIFFS_opendir(&fs_desc->fs, dirname, d); spiffs_DIR *res = SPIFFS_opendir(&fs_desc->fs, dirname, d);
@ -371,7 +378,7 @@ static int _opendir(vfs_DIR *dirp, const char *dirname, const char *abs_path)
static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry) static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
{ {
spiffs_DIR *d = (spiffs_DIR *)&dirp->private_data.buffer[0]; spiffs_DIR *d = _get_spifs_dir(dirp);
struct spiffs_dirent e; struct spiffs_dirent e;
struct spiffs_dirent *ret; struct spiffs_dirent *ret;
@ -396,7 +403,7 @@ static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
static int _closedir(vfs_DIR *dirp) static int _closedir(vfs_DIR *dirp)
{ {
spiffs_DIR *d = (spiffs_DIR *)&dirp->private_data.buffer[0]; spiffs_DIR *d = _get_spifs_dir(dirp);
return spiffs_err_to_errno(SPIFFS_closedir(d)); return spiffs_err_to_errno(SPIFFS_closedir(d));
} }