Skip to content

Commit dc513b1

Browse files
committed
Silenced more of aldot's warnings
Flags used: -Wall -Wextra -Wshadow -Wwrite-strings -Wundef -Wstrict-prototypes -Wunused -Wunused-parameter -Wunused-function -Wunused-value -Wmissing-prototypes -Wmissing-declarations -Wold-style-definition
1 parent aa50e03 commit dc513b1

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

lfs.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -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 {

tests/template.fmt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ static void test_assert(const char *file, unsigned line,
3737

3838

3939
// utility functions for traversals
40-
static int __attribute__((used)) test_count(void *p,
41-
lfs_block_t b __attribute__((unused))) {{
40+
static int __attribute__((used)) test_count(void *p, lfs_block_t b) {{
41+
(void)b;
4242
unsigned *u = (unsigned*)p;
4343
*u += 1;
4444
return 0;

0 commit comments

Comments
 (0)