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

Cleaned up a couple of warnings

Browse Source 
- Shifting signed 32-bit value by 31 bits is undefined behaviour

  This was an interesting one as on initial inspection, `uint8_t & 1`
  looks like it will result in an unsigned variable. However, due to
  uint8_t being "smaller" than int, this actually results in a signed
  int, causing an undefined shift operation.

- Identical inner 'if' condition is always true (outer condition is
  'true' and inner condition is 'true').

  This was caused by the use of `if (true) {` to avoid "goto bypasses
  variable initialization" warnings. Using just `{` instead seems to
  avoid this problem.

found by keck-in-space and armandas
This commit is contained in:
Christopher Haster
2019-04-09 18:37:53 -05:00
parent 1ff6432298
commit 651e14e796
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lfs.c
View File

@@ -855,7 +855,7 @@ static lfs_stag_t lfs_dir_fetchmatch(lfs_t *lfs,
} }
// reset the next bit if we need to // reset the next bit if we need to
ptag ^= (lfs_tag_chunk(tag) & 1) << 31; ptag ^= (lfs_tag_chunk(tag) & 1U) << 31;
// toss our crc into the filesystem seed for // toss our crc into the filesystem seed for
// pseudorandom numbers // pseudorandom numbers
@@ -1498,7 +1498,7 @@ static int lfs_dir_compact(lfs_t *lfs,
// begin loop to commit compaction to blocks until a compact sticks // begin loop to commit compaction to blocks until a compact sticks
while (true) { while (true) {
if (true) { {
// There's nothing special about our global delta, so feed it into // There's nothing special about our global delta, so feed it into
// our local global delta // our local global delta
int err = lfs_dir_getgstate(lfs, dir, &lfs->gdelta); int err = lfs_dir_getgstate(lfs, dir, &lfs->gdelta);
@@ -1603,7 +1603,6 @@ static int lfs_dir_compact(lfs_t *lfs,
lfs_gstate_xormove(&lfs->gpending, lfs_gstate_xormove(&lfs->gpending,
&lfs->gpending, 0x3ff, NULL); &lfs->gpending, 0x3ff, NULL);
} }
} }
break; break;
@@ -2123,7 +2122,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
} }
LFS_ASSERT(nblock >= 2 && nblock <= lfs->cfg->block_count); LFS_ASSERT(nblock >= 2 && nblock <= lfs->cfg->block_count);
if (true) { {
err = lfs_bd_erase(lfs, nblock); err = lfs_bd_erase(lfs, nblock);
if (err) { if (err) {
if (err == LFS_ERR_CORRUPT) { if (err == LFS_ERR_CORRUPT) {
@@ -3298,7 +3297,7 @@ static int lfs_deinit(lfs_t *lfs) {
int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) {
int err = 0; int err = 0;
if (true) { {
err = lfs_init(lfs, cfg); err = lfs_init(lfs, cfg);
if (err) { if (err) {
return err; return err;
@@ -4182,7 +4181,7 @@ static int lfs1_moved(lfs_t *lfs, const void *e) {
static int lfs1_mount(lfs_t *lfs, struct lfs1 *lfs1, static int lfs1_mount(lfs_t *lfs, struct lfs1 *lfs1,
const struct lfs_config *cfg) { const struct lfs_config *cfg) {
int err = 0; int err = 0;
if (true) { {
err = lfs_init(lfs, cfg); err = lfs_init(lfs, cfg);
if (err) { if (err) {
return err; return err;
@@ -4253,7 +4252,7 @@ int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) {
return err; return err;
} }
if (true) { {
// iterate through each directory, copying over entries // iterate through each directory, copying over entries
// into new directory // into new directory
lfs1_dir_t dir1; lfs1_dir_t dir1;