Skip to content

Commit 809ffde

Browse files
gekygeky
authored
Merge pull request #24 from aldot/silence-shadow-warnings-1
Silence shadow warnings
2 parents fd04ed4 + dc513b1 commit 809ffde

File tree

4 files changed

+38
-33
lines changed

4 files changed

+38
-33
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test: test_format test_dirs test_files test_seek test_truncate test_parallel \
3737
test_alloc test_paths test_orphan test_move test_corrupt
3838
test_%: tests/test_%.sh
3939
ifdef QUIET
40-
./$< | sed -n '/^[-=]/p'
40+
@./$< | sed -n '/^[-=]/p'
4141
else
4242
./$<
4343
endif

‎emubd/lfs_emubd.c

Lines changed: 1 addition & 1 deletion
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
}

‎lfs.c

Lines changed: 31 additions & 27 deletions
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
}
@@ -1016,6 +1016,7 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) {
10161016
}
10171017

10181018
lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) {
1019+
(void)lfs;
10191020
return dir->pos;
10201021
}
10211022

@@ -1116,7 +1117,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
11161117
if (size != lfs->cfg->block_size) {
11171118
for (lfs_off_t i = 0; i < size; i++) {
11181119
uint8_t data;
1119-
int err = lfs_cache_read(lfs, rcache, NULL,
1120+
err = lfs_cache_read(lfs, rcache, NULL,
11201121
head, i, &data, 1);
11211122
if (err) {
11221123
return err;
@@ -1142,7 +1143,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
11421143
lfs_size_t skips = lfs_ctz(index) + 1;
11431144

11441145
for (lfs_off_t i = 0; i < skips; i++) {
1145-
int err = lfs_cache_prog(lfs, pcache, rcache,
1146+
err = lfs_cache_prog(lfs, pcache, rcache,
11461147
nblock, 4*i, &head, 4);
11471148
if (err) {
11481149
if (err == LFS_ERR_CORRUPT) {
@@ -1450,7 +1451,7 @@ int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) {
14501451
!lfs_pairisnull(file->pair)) {
14511452
// update dir entry
14521453
lfs_dir_t cwd;
1453-
int err = lfs_dir_fetch(lfs, &cwd, file->pair);
1454+
err = lfs_dir_fetch(lfs, &cwd, file->pair);
14541455
if (err) {
14551456
return err;
14561457
}
@@ -1669,7 +1670,8 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
16691670
return LFS_ERR_INVAL;
16701671
}
16711672

1672-
if (size < lfs_file_size(lfs, file)) {
1673+
lfs_off_t oldsize = lfs_file_size(lfs, file);
1674+
if (size < oldsize) {
16731675
// need to flush since directly changing metadata
16741676
int err = lfs_file_flush(lfs, file);
16751677
if (err) {
@@ -1686,11 +1688,11 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
16861688

16871689
file->size = size;
16881690
file->flags |= LFS_F_DIRTY;
1689-
} else if (size > lfs_file_size(lfs, file)) {
1691+
} else if (size > oldsize) {
16901692
lfs_off_t pos = file->pos;
16911693

16921694
// flush+seek if not already at end
1693-
if (file->pos != lfs_file_size(lfs, file)) {
1695+
if (file->pos != oldsize) {
16941696
int err = lfs_file_seek(lfs, file, 0, SEEK_END);
16951697
if (err) {
16961698
return err;
@@ -1716,6 +1718,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
17161718
}
17171719

17181720
lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) {
1721+
(void)lfs;
17191722
return file->pos;
17201723
}
17211724

@@ -1729,6 +1732,7 @@ int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) {
17291732
}
17301733

17311734
lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) {
1735+
(void)lfs;
17321736
if (file->flags & LFS_F_WRITING) {
17331737
return lfs_max(file->pos, file->size);
17341738
} else {
@@ -1737,7 +1741,7 @@ lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) {
17371741
}
17381742

17391743

1740-
/// General fs oprations ///
1744+
/// General fs operations ///
17411745
int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) {
17421746
// check for root, can only be something like '/././../.'
17431747
if (strspn(path, "/.") == strlen(path)) {
@@ -1801,7 +1805,7 @@ int lfs_remove(lfs_t *lfs, const char *path) {
18011805
// must be empty before removal, checking size
18021806
// without masking top bit checks for any case where
18031807
// dir is not empty
1804-
int err = lfs_dir_fetch(lfs, &dir, entry.d.u.dir);
1808+
err = lfs_dir_fetch(lfs, &dir, entry.d.u.dir);
18051809
if (err) {
18061810
return err;
18071811
} else if (dir.d.size != sizeof(dir.d)+4) {
@@ -1826,7 +1830,7 @@ int lfs_remove(lfs_t *lfs, const char *path) {
18261830
cwd.d.tail[0] = dir.d.tail[0];
18271831
cwd.d.tail[1] = dir.d.tail[1];
18281832

1829-
int err = lfs_dir_commit(lfs, &cwd, NULL, 0);
1833+
err = lfs_dir_commit(lfs, &cwd, NULL, 0);
18301834
if (err) {
18311835
return err;
18321836
}
@@ -1883,7 +1887,7 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
18831887
// must be empty before removal, checking size
18841888
// without masking top bit checks for any case where
18851889
// dir is not empty
1886-
int err = lfs_dir_fetch(lfs, &dir, preventry.d.u.dir);
1890+
err = lfs_dir_fetch(lfs, &dir, preventry.d.u.dir);
18871891
if (err) {
18881892
return err;
18891893
} else if (dir.d.size != sizeof(dir.d)+4) {
@@ -1910,12 +1914,12 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
19101914
newentry.d.nlen = strlen(newpath);
19111915

19121916
if (prevexists) {
1913-
int err = lfs_dir_update(lfs, &newcwd, &newentry, newpath);
1917+
err = lfs_dir_update(lfs, &newcwd, &newentry, newpath);
19141918
if (err) {
19151919
return err;
19161920
}
19171921
} else {
1918-
int err = lfs_dir_append(lfs, &newcwd, &newentry, newpath);
1922+
err = lfs_dir_append(lfs, &newcwd, &newentry, newpath);
19191923
if (err) {
19201924
return err;
19211925
}
@@ -1943,7 +1947,7 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
19431947
newcwd.d.tail[0] = dir.d.tail[0];
19441948
newcwd.d.tail[1] = dir.d.tail[1];
19451949

1946-
int err = lfs_dir_commit(lfs, &newcwd, NULL, 0);
1950+
err = lfs_dir_commit(lfs, &newcwd, NULL, 0);
19471951
if (err) {
19481952
return err;
19491953
}
@@ -2080,7 +2084,7 @@ int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) {
20802084
// write both pairs to be safe
20812085
bool valid = false;
20822086
for (int i = 0; i < 2; i++) {
2083-
int err = lfs_dir_commit(lfs, &superdir, (struct lfs_region[]){
2087+
err = lfs_dir_commit(lfs, &superdir, (struct lfs_region[]){
20842088
{sizeof(superdir.d), sizeof(superblock.d),
20852089
&superblock.d, sizeof(superblock.d)}
20862090
}, 1);
@@ -2125,7 +2129,7 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
21252129
}
21262130

21272131
if (!err) {
2128-
int err = lfs_bd_read(lfs, dir.pair[0], sizeof(dir.d),
2132+
err = lfs_bd_read(lfs, dir.pair[0], sizeof(dir.d),
21292133
&superblock.d, sizeof(superblock.d));
21302134
if (err) {
21312135
return err;
@@ -2182,15 +2186,15 @@ int lfs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data) {
21822186

21832187
// iterate over contents
21842188
while (dir.off + sizeof(entry.d) <= (0x7fffffff & dir.d.size)-4) {
2185-
int err = lfs_bd_read(lfs, dir.pair[0], dir.off,
2189+
err = lfs_bd_read(lfs, dir.pair[0], dir.off,
21862190
&entry.d, sizeof(entry.d));
21872191
if (err) {
21882192
return err;
21892193
}
21902194

21912195
dir.off += lfs_entry_size(&entry);
21922196
if ((0x70 & entry.d.type) == (0x70 & LFS_TYPE_REG)) {
2193-
int err = lfs_ctz_traverse(lfs, &lfs->rcache, NULL,
2197+
err = lfs_ctz_traverse(lfs, &lfs->rcache, NULL,
21942198
entry.d.u.file.head, entry.d.u.file.size, cb, data);
21952199
if (err) {
21962200
return err;
@@ -2244,7 +2248,7 @@ static int lfs_pred(lfs_t *lfs, const lfs_block_t dir[2], lfs_dir_t *pdir) {
22442248
return true;
22452249
}
22462250

2247-
int err = lfs_dir_fetch(lfs, pdir, pdir->d.tail);
2251+
err = lfs_dir_fetch(lfs, pdir, pdir->d.tail);
22482252
if (err) {
22492253
return err;
22502254
}
@@ -2270,7 +2274,7 @@ static int lfs_parent(lfs_t *lfs, const lfs_block_t dir[2],
22702274
}
22712275

22722276
while (true) {
2273-
int err = lfs_dir_next(lfs, parent, entry);
2277+
err = lfs_dir_next(lfs, parent, entry);
22742278
if (err && err != LFS_ERR_NOENT) {
22752279
return err;
22762280
}
@@ -2304,13 +2308,13 @@ static int lfs_moved(lfs_t *lfs, const void *e) {
23042308
// iterate over all directory directory entries
23052309
lfs_entry_t entry;
23062310
while (!lfs_pairisnull(cwd.d.tail)) {
2307-
int err = lfs_dir_fetch(lfs, &cwd, cwd.d.tail);
2311+
err = lfs_dir_fetch(lfs, &cwd, cwd.d.tail);
23082312
if (err) {
23092313
return err;
23102314
}
23112315

23122316
while (true) {
2313-
int err = lfs_dir_next(lfs, &cwd, &entry);
2317+
err = lfs_dir_next(lfs, &cwd, &entry);
23142318
if (err && err != LFS_ERR_NOENT) {
23152319
return err;
23162320
}
@@ -2441,7 +2445,7 @@ int lfs_deorphan(lfs_t *lfs) {
24412445
// check entries for moves
24422446
lfs_entry_t entry;
24432447
while (true) {
2444-
int err = lfs_dir_next(lfs, &cwd, &entry);
2448+
err = lfs_dir_next(lfs, &cwd, &entry);
24452449
if (err && err != LFS_ERR_NOENT) {
24462450
return err;
24472451
}
@@ -2460,15 +2464,15 @@ int lfs_deorphan(lfs_t *lfs) {
24602464
if (moved) {
24612465
LFS_DEBUG("Found move %d %d",
24622466
entry.d.u.dir[0], entry.d.u.dir[1]);
2463-
int err = lfs_dir_remove(lfs, &cwd, &entry);
2467+
err = lfs_dir_remove(lfs, &cwd, &entry);
24642468
if (err) {
24652469
return err;
24662470
}
24672471
} else {
24682472
LFS_DEBUG("Found partial move %d %d",
24692473
entry.d.u.dir[0], entry.d.u.dir[1]);
24702474
entry.d.type &= ~0x80;
2471-
int err = lfs_dir_update(lfs, &cwd, &entry, NULL);
2475+
err = lfs_dir_update(lfs, &cwd, &entry, NULL);
24722476
if (err) {
24732477
return err;
24742478
}

‎tests/template.fmt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88

99
// test stuff
10-
void test_log(const char *s, uintmax_t v) {{
10+
static void test_log(const char *s, uintmax_t v) {{
1111
printf("%s: %jd\n", s, v);
1212
}}
1313

14-
void test_assert(const char *file, unsigned line,
14+
static void test_assert(const char *file, unsigned line,
1515
const char *s, uintmax_t v, uintmax_t e) {{
1616
static const char *last[6] = {{0, 0}};
1717
if (v != e || !(last[0] == s || last[1] == s ||
@@ -37,7 +37,8 @@ void test_assert(const char *file, unsigned line,
3737

3838

3939
// utility functions for traversals
40-
int test_count(void *p, lfs_block_t b) {{
40+
static int __attribute__((used)) test_count(void *p, lfs_block_t b) {{
41+
(void)b;
4142
unsigned *u = (unsigned*)p;
4243
*u += 1;
4344
return 0;
@@ -96,7 +97,7 @@ const struct lfs_config cfg = {{
9697

9798

9899
// Entry point
99-
int main() {{
100+
int main(void) {{
100101
lfs_emubd_create(&cfg, "blocks");
101102

102103
{tests}

0 commit comments

Comments
 (0)