github-mirrors/thirdparty-littlefs
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-littlefs.git synced 2025-10-31 08:42:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings when LFS_READONLY defined

Browse Source
This commit is contained in:
Tobias Nießen
2021-06-14 12:12:38 +02:00
parent ead50807f1
commit fb2c311bb4
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lfs.c
View File

@@ -11,12 +11,15 @@
#define LFS_BLOCK_INLINE ((lfs_block_t)-2) #define LFS_BLOCK_INLINE ((lfs_block_t)-2)
/// Caching block device operations /// /// Caching block device operations ///
#ifndef LFS_READONLY
static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) { static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) {
// do not zero, cheaper if cache is readonly or only going to be // do not zero, cheaper if cache is readonly or only going to be
// written with identical data (during relocates) // written with identical data (during relocates)
(void)lfs; (void)lfs;
rcache->block = LFS_BLOCK_NULL; rcache->block = LFS_BLOCK_NULL;
} }
#endif
static inline void lfs_cache_zero(lfs_t *lfs, lfs_cache_t *pcache) { static inline void lfs_cache_zero(lfs_t *lfs, lfs_cache_t *pcache) {
// zero to avoid information leak // zero to avoid information leak
@@ -268,22 +271,26 @@ static inline int lfs_pair_cmp(
paira[0] == pairb[1] || paira[1] == pairb[0]); paira[0] == pairb[1] || paira[1] == pairb[0]);
} }
#ifndef LFS_READONLY
static inline bool lfs_pair_sync( static inline bool lfs_pair_sync(
const lfs_block_t paira[2], const lfs_block_t paira[2],
const lfs_block_t pairb[2]) { const lfs_block_t pairb[2]) {
return (paira[0] == pairb[0] && paira[1] == pairb[1]) || return (paira[0] == pairb[0] && paira[1] == pairb[1]) ||
(paira[0] == pairb[1] && paira[1] == pairb[0]); (paira[0] == pairb[1] && paira[1] == pairb[0]);
} }
#endif
static inline void lfs_pair_fromle32(lfs_block_t pair[2]) { static inline void lfs_pair_fromle32(lfs_block_t pair[2]) {
pair[0] = lfs_fromle32(pair[0]); pair[0] = lfs_fromle32(pair[0]);
pair[1] = lfs_fromle32(pair[1]); pair[1] = lfs_fromle32(pair[1]);
} }
#ifndef LFS_READONLY
static inline void lfs_pair_tole32(lfs_block_t pair[2]) { static inline void lfs_pair_tole32(lfs_block_t pair[2]) {
pair[0] = lfs_tole32(pair[0]); pair[0] = lfs_tole32(pair[0]);
pair[1] = lfs_tole32(pair[1]); pair[1] = lfs_tole32(pair[1]);
} }
#endif
// operations on 32-bit entry tags // operations on 32-bit entry tags
typedef uint32_t lfs_tag_t; typedef uint32_t lfs_tag_t;
@@ -365,6 +372,7 @@ static inline bool lfs_gstate_iszero(const lfs_gstate_t *a) {
return true; return true;
} }
#ifndef LFS_READONLY
static inline bool lfs_gstate_hasorphans(const lfs_gstate_t *a) { static inline bool lfs_gstate_hasorphans(const lfs_gstate_t *a) {
return lfs_tag_size(a->tag); return lfs_tag_size(a->tag);
} }
@@ -376,6 +384,7 @@ static inline uint8_t lfs_gstate_getorphans(const lfs_gstate_t *a) {
static inline bool lfs_gstate_hasmove(const lfs_gstate_t *a) { static inline bool lfs_gstate_hasmove(const lfs_gstate_t *a) {
return lfs_tag_type1(a->tag); return lfs_tag_type1(a->tag);
} }
#endif
static inline bool lfs_gstate_hasmovehere(const lfs_gstate_t *a, static inline bool lfs_gstate_hasmovehere(const lfs_gstate_t *a,
const lfs_block_t *pair) { const lfs_block_t *pair) {
@@ -388,11 +397,13 @@ static inline void lfs_gstate_fromle32(lfs_gstate_t *a) {
a->pair[1] = lfs_fromle32(a->pair[1]); a->pair[1] = lfs_fromle32(a->pair[1]);
} }
#ifndef LFS_READONLY
static inline void lfs_gstate_tole32(lfs_gstate_t *a) { static inline void lfs_gstate_tole32(lfs_gstate_t *a) {
a->tag = lfs_tole32(a->tag); a->tag = lfs_tole32(a->tag);
a->pair[0] = lfs_tole32(a->pair[0]); a->pair[0] = lfs_tole32(a->pair[0]);
a->pair[1] = lfs_tole32(a->pair[1]); a->pair[1] = lfs_tole32(a->pair[1]);
} }
#endif
// other endianness operations // other endianness operations
static void lfs_ctz_fromle32(struct lfs_ctz *ctz) { static void lfs_ctz_fromle32(struct lfs_ctz *ctz) {
@@ -416,6 +427,7 @@ static inline void lfs_superblock_fromle32(lfs_superblock_t *superblock) {
superblock->attr_max = lfs_fromle32(superblock->attr_max); superblock->attr_max = lfs_fromle32(superblock->attr_max);
} }
#ifndef LFS_READONLY
static inline void lfs_superblock_tole32(lfs_superblock_t *superblock) { static inline void lfs_superblock_tole32(lfs_superblock_t *superblock) {
superblock->version = lfs_tole32(superblock->version); superblock->version = lfs_tole32(superblock->version);
superblock->block_size = lfs_tole32(superblock->block_size); superblock->block_size = lfs_tole32(superblock->block_size);
@@ -424,6 +436,7 @@ static inline void lfs_superblock_tole32(lfs_superblock_t *superblock) {
superblock->file_max = lfs_tole32(superblock->file_max); superblock->file_max = lfs_tole32(superblock->file_max);
superblock->attr_max = lfs_tole32(superblock->attr_max); superblock->attr_max = lfs_tole32(superblock->attr_max);
} }
#endif
#ifndef LFS_NO_ASSERT #ifndef LFS_NO_ASSERT
static bool lfs_mlist_isopen(struct lfs_mlist *head, static bool lfs_mlist_isopen(struct lfs_mlist *head,