Skip to content

Commit 029361e

Browse files
aldotgeky
aldot
authored and
geky
committed
Silence shadow warnings
1 parent 3101bc9 commit 029361e

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Diff for: ‎emubd/lfs_emubd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) {
190190
}
191191

192192
if (!err && S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode)) {
193-
int err = unlink(emu->path);
193+
err = unlink(emu->path);
194194
if (err) {
195195
return -errno;
196196
}

Diff for: ‎lfs.c

+23-23
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static int lfs_dir_commit(lfs_t *lfs, lfs_dir_t *dir,
481481
while (newoff < (0x7fffffff & dir->d.size)-4) {
482482
if (i < count && regions[i].oldoff == oldoff) {
483483
lfs_crc(&crc, regions[i].newdata, regions[i].newlen);
484-
int err = lfs_bd_prog(lfs, dir->pair[0],
484+
err = lfs_bd_prog(lfs, dir->pair[0],
485485
newoff, regions[i].newdata, regions[i].newlen);
486486
if (err) {
487487
if (err == LFS_ERR_CORRUPT) {
@@ -495,7 +495,7 @@ static int lfs_dir_commit(lfs_t *lfs, lfs_dir_t *dir,
495495
i += 1;
496496
} else {
497497
uint8_t data;
498-
int err = lfs_bd_read(lfs, oldpair[1], oldoff, &data, 1);
498+
err = lfs_bd_read(lfs, oldpair[1], oldoff, &data, 1);
499499
if (err) {
500500
return err;
501501
}
@@ -1005,7 +1005,7 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) {
10051005
return LFS_ERR_INVAL;
10061006
}
10071007

1008-
int err = lfs_dir_fetch(lfs, dir, dir->d.tail);
1008+
err = lfs_dir_fetch(lfs, dir, dir->d.tail);
10091009
if (err) {
10101010
return err;
10111011
}
@@ -1116,7 +1116,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
11161116
if (size != lfs->cfg->block_size) {
11171117
for (lfs_off_t i = 0; i < size; i++) {
11181118
uint8_t data;
1119-
int err = lfs_cache_read(lfs, rcache, NULL,
1119+
err = lfs_cache_read(lfs, rcache, NULL,
11201120
head, i, &data, 1);
11211121
if (err) {
11221122
return err;
@@ -1142,7 +1142,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
11421142
lfs_size_t skips = lfs_ctz(index) + 1;
11431143

11441144
for (lfs_off_t i = 0; i < skips; i++) {
1145-
int err = lfs_cache_prog(lfs, pcache, rcache,
1145+
err = lfs_cache_prog(lfs, pcache, rcache,
11461146
nblock, 4*i, &head, 4);
11471147
if (err) {
11481148
if (err == LFS_ERR_CORRUPT) {
@@ -1450,7 +1450,7 @@ int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) {
14501450
!lfs_pairisnull(file->pair)) {
14511451
// update dir entry
14521452
lfs_dir_t cwd;
1453-
int err = lfs_dir_fetch(lfs, &cwd, file->pair);
1453+
err = lfs_dir_fetch(lfs, &cwd, file->pair);
14541454
if (err) {
14551455
return err;
14561456
}
@@ -1801,7 +1801,7 @@ int lfs_remove(lfs_t *lfs, const char *path) {
18011801
// must be empty before removal, checking size
18021802
// without masking top bit checks for any case where
18031803
// dir is not empty
1804-
int err = lfs_dir_fetch(lfs, &dir, entry.d.u.dir);
1804+
err = lfs_dir_fetch(lfs, &dir, entry.d.u.dir);
18051805
if (err) {
18061806
return err;
18071807
} else if (dir.d.size != sizeof(dir.d)+4) {
@@ -1826,7 +1826,7 @@ int lfs_remove(lfs_t *lfs, const char *path) {
18261826
cwd.d.tail[0] = dir.d.tail[0];
18271827
cwd.d.tail[1] = dir.d.tail[1];
18281828

1829-
int err = lfs_dir_commit(lfs, &cwd, NULL, 0);
1829+
err = lfs_dir_commit(lfs, &cwd, NULL, 0);
18301830
if (err) {
18311831
return err;
18321832
}
@@ -1883,7 +1883,7 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
18831883
// must be empty before removal, checking size
18841884
// without masking top bit checks for any case where
18851885
// dir is not empty
1886-
int err = lfs_dir_fetch(lfs, &dir, preventry.d.u.dir);
1886+
err = lfs_dir_fetch(lfs, &dir, preventry.d.u.dir);
18871887
if (err) {
18881888
return err;
18891889
} else if (dir.d.size != sizeof(dir.d)+4) {
@@ -1910,12 +1910,12 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
19101910
newentry.d.nlen = strlen(newpath);
19111911

19121912
if (prevexists) {
1913-
int err = lfs_dir_update(lfs, &newcwd, &newentry, newpath);
1913+
err = lfs_dir_update(lfs, &newcwd, &newentry, newpath);
19141914
if (err) {
19151915
return err;
19161916
}
19171917
} else {
1918-
int err = lfs_dir_append(lfs, &newcwd, &newentry, newpath);
1918+
err = lfs_dir_append(lfs, &newcwd, &newentry, newpath);
19191919
if (err) {
19201920
return err;
19211921
}
@@ -1943,7 +1943,7 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
19431943
newcwd.d.tail[0] = dir.d.tail[0];
19441944
newcwd.d.tail[1] = dir.d.tail[1];
19451945

1946-
int err = lfs_dir_commit(lfs, &newcwd, NULL, 0);
1946+
err = lfs_dir_commit(lfs, &newcwd, NULL, 0);
19471947
if (err) {
19481948
return err;
19491949
}
@@ -2080,7 +2080,7 @@ int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) {
20802080
// write both pairs to be safe
20812081
bool valid = false;
20822082
for (int i = 0; i < 2; i++) {
2083-
int err = lfs_dir_commit(lfs, &superdir, (struct lfs_region[]){
2083+
err = lfs_dir_commit(lfs, &superdir, (struct lfs_region[]){
20842084
{sizeof(superdir.d), sizeof(superblock.d),
20852085
&superblock.d, sizeof(superblock.d)}
20862086
}, 1);
@@ -2125,7 +2125,7 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
21252125
}
21262126

21272127
if (!err) {
2128-
int err = lfs_bd_read(lfs, dir.pair[0], sizeof(dir.d),
2128+
err = lfs_bd_read(lfs, dir.pair[0], sizeof(dir.d),
21292129
&superblock.d, sizeof(superblock.d));
21302130
if (err) {
21312131
return err;
@@ -2182,15 +2182,15 @@ int lfs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data) {
21822182

21832183
// iterate over contents
21842184
while (dir.off + sizeof(entry.d) <= (0x7fffffff & dir.d.size)-4) {
2185-
int err = lfs_bd_read(lfs, dir.pair[0], dir.off,
2185+
err = lfs_bd_read(lfs, dir.pair[0], dir.off,
21862186
&entry.d, sizeof(entry.d));
21872187
if (err) {
21882188
return err;
21892189
}
21902190

21912191
dir.off += lfs_entry_size(&entry);
21922192
if ((0x70 & entry.d.type) == (0x70 & LFS_TYPE_REG)) {
2193-
int err = lfs_ctz_traverse(lfs, &lfs->rcache, NULL,
2193+
err = lfs_ctz_traverse(lfs, &lfs->rcache, NULL,
21942194
entry.d.u.file.head, entry.d.u.file.size, cb, data);
21952195
if (err) {
21962196
return err;
@@ -2244,7 +2244,7 @@ static int lfs_pred(lfs_t *lfs, const lfs_block_t dir[2], lfs_dir_t *pdir) {
22442244
return true;
22452245
}
22462246

2247-
int err = lfs_dir_fetch(lfs, pdir, pdir->d.tail);
2247+
err = lfs_dir_fetch(lfs, pdir, pdir->d.tail);
22482248
if (err) {
22492249
return err;
22502250
}
@@ -2270,7 +2270,7 @@ static int lfs_parent(lfs_t *lfs, const lfs_block_t dir[2],
22702270
}
22712271

22722272
while (true) {
2273-
int err = lfs_dir_next(lfs, parent, entry);
2273+
err = lfs_dir_next(lfs, parent, entry);
22742274
if (err && err != LFS_ERR_NOENT) {
22752275
return err;
22762276
}
@@ -2304,13 +2304,13 @@ static int lfs_moved(lfs_t *lfs, const void *e) {
23042304
// iterate over all directory directory entries
23052305
lfs_entry_t entry;
23062306
while (!lfs_pairisnull(cwd.d.tail)) {
2307-
int err = lfs_dir_fetch(lfs, &cwd, cwd.d.tail);
2307+
err = lfs_dir_fetch(lfs, &cwd, cwd.d.tail);
23082308
if (err) {
23092309
return err;
23102310
}
23112311

23122312
while (true) {
2313-
int err = lfs_dir_next(lfs, &cwd, &entry);
2313+
err = lfs_dir_next(lfs, &cwd, &entry);
23142314
if (err && err != LFS_ERR_NOENT) {
23152315
return err;
23162316
}
@@ -2441,7 +2441,7 @@ int lfs_deorphan(lfs_t *lfs) {
24412441
// check entries for moves
24422442
lfs_entry_t entry;
24432443
while (true) {
2444-
int err = lfs_dir_next(lfs, &cwd, &entry);
2444+
err = lfs_dir_next(lfs, &cwd, &entry);
24452445
if (err && err != LFS_ERR_NOENT) {
24462446
return err;
24472447
}
@@ -2460,15 +2460,15 @@ int lfs_deorphan(lfs_t *lfs) {
24602460
if (moved) {
24612461
LFS_DEBUG("Found move %d %d",
24622462
entry.d.u.dir[0], entry.d.u.dir[1]);
2463-
int err = lfs_dir_remove(lfs, &cwd, &entry);
2463+
err = lfs_dir_remove(lfs, &cwd, &entry);
24642464
if (err) {
24652465
return err;
24662466
}
24672467
} else {
24682468
LFS_DEBUG("Found partial move %d %d",
24692469
entry.d.u.dir[0], entry.d.u.dir[1]);
24702470
entry.d.type &= ~0x80;
2471-
int err = lfs_dir_update(lfs, &cwd, &entry, NULL);
2471+
err = lfs_dir_update(lfs, &cwd, &entry, NULL);
24722472
if (err) {
24732473
return err;
24742474
}

0 commit comments

Comments
 (0)