Github/littlefs
1
Fork 0
Code Actions Activity

bmap: Finally fixed embedded directive macro warning with bmap format

Browse Source 
It makes sense, nesting directives (#ifdef) in macro arguments invites
all sort of weird parse errors. Unfortunately, this doesn't leave us
with many options for conditionally including rattrs in LFS3_RATTRS
lists... This is especially important for lfs3_format, where we can
expect many rattrs to depend on compile-time configurations.

To fix the warning, I went ahead and adopted a conditionally predefined
LFS3_RATTR_IFDEF_BMAP before the rattr list. I'm not super happy with
this fix (ugh, missing comma), but it at least avoids a warning and
non-portable behavior.
This commit is contained in:
Christopher Haster
2025-10-04 17:38:12 -05:00
parent 982394305e
commit 4b2bd11393
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3.c
+19 -11
View File
@@ -16600,6 +16600,24 @@ static int lfs3_formatinited(lfs3_t *lfs3) {
return err; return err;
} }
// include on-disk bmap?
//
// TODO this is not the greatest solution, but at least it's
// warning free... alternatives? switch to builder pattern?
#ifdef LFS3_BMAP
#define LFS3_RATTR_IFDEF_BMAP \
(lfs3_m_isbmapfast(lfs3->flags) \
|| lfs3_m_isbmapslow(lfs3->flags) \
|| lfs3_m_isbmapcache(lfs3->flags)) \
? LFS3_RATTR_DATA(LFS3_TAG_GBMAPDELTA, 0, \
(&((struct {lfs3_data_t d;}){ \
lfs3_data_fromgbmap(&lfs3->gbmap, \
lfs3->gbmap_d)}).d)) \
: LFS3_RATTR_NOOP(),
#else
#define LFS3_RATTR_IFDEF_BMAP
#endif
// our initial superblock contains a couple things: // our initial superblock contains a couple things:
// - our magic string, "littlefs" // - our magic string, "littlefs"
// - any format-time configuration // - any format-time configuration
@@ -16630,17 +16648,7 @@ static int lfs3_formatinited(lfs3_t *lfs3) {
LFS3_RATTR_LEB128( LFS3_RATTR_LEB128(
LFS3_TAG_FILELIMIT, 0, LFS3_TAG_FILELIMIT, 0,
lfs3->file_limit), lfs3->file_limit),
// TODO this is no good, switch to a builder pattern? LFS3_RATTR_IFDEF_BMAP
#ifdef LFS3_BMAP
(lfs3_m_isbmapfast(lfs3->flags)
|| lfs3_m_isbmapslow(lfs3->flags)
|| lfs3_m_isbmapcache(lfs3->flags))
? LFS3_RATTR_DATA(LFS3_TAG_GBMAPDELTA, 0,
(&((struct {lfs3_data_t d;}){
lfs3_data_fromgbmap(&lfs3->gbmap,
lfs3->gbmap_d)}).d))
: LFS3_RATTR_NOOP(),
#endif
LFS3_RATTR_NAME( LFS3_RATTR_NAME(
LFS3_TAG_BOOKMARK, +1, LFS3_TAG_BOOKMARK, +1,
0, NULL, 0))); 0, NULL, 0)));