diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2017-11-01 23:08:45 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2017-11-03 19:41:32 +0100 |
| commit | 03dafe3202372e557f7125dc8155cb1d564d1f5e (patch) | |
| tree | 5e289dc97ea58422161586391d1255e4175365d9 | |
| parent | 0555cb2ea9bdc8e210e87e009154954a9bbc3a55 (diff) | |
Enable further warning flags, address new warnings
mtd_debug: Remove a duplicate if case. MTD_CAP_NANDFLASH has only one
flag set (MTD_WRITEABLE). Directly below, we had a check for
MTD_WRITEABLE in the else branch which can't possible ever have
triggered. Checking for MTD_WRITEABLE in addition to the CAP constants
was probably not intended anyway, given the check for the individual
flags if all else fails.
integck: We already established that "r" is less than the number of
elements in the list, so the loop condition doesn't need to check
if w is NULL in addition. At least this way, the compiler "gets"
that w cannot be NULL below and doesn't issue warnings.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | misc-utils/mtd_debug.c | 2 | ||||
| -rw-r--r-- | tests/fs-tests/integrity/integck.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3223c61..83d754f 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,10 @@ UL_WARN_ADD([-Wunused-but-set-variable]) UL_WARN_ADD([-Wunused-parameter]) UL_WARN_ADD([-Wunused-result]) UL_WARN_ADD([-Wunused-variable]) +UL_WARN_ADD([-Wduplicated-cond]) +UL_WARN_ADD([-Wduplicated-branches]) +UL_WARN_ADD([-Wrestrict]) +UL_WARN_ADD([-Wnull-dereference]) UL_WARN_ADD([-Wno-shadow]) UL_WARN_ADD([-Wno-sign-compare]) diff --git a/misc-utils/mtd_debug.c b/misc-utils/mtd_debug.c index 1fd6871..ac37e23 100644 --- a/misc-utils/mtd_debug.c +++ b/misc-utils/mtd_debug.c @@ -286,8 +286,6 @@ static int showinfo(int fd) printf("MTD_CAP_NORFLASH"); else if (mtd.flags == MTD_CAP_NANDFLASH) printf("MTD_CAP_NANDFLASH"); - else if (mtd.flags == MTD_WRITEABLE) - printf("MTD_WRITEABLE"); else { int first = 1; static struct { diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index cac145d..84753d6 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -1164,7 +1164,7 @@ static int file_mmap_write(struct file_info *file) } r = random_no(write_cnt); w = file->writes; - for (i = 0; w && w->next && i < r; i++) + for (i = 0; i < r; i++) w = w->next; offs = (w->offset / fsinfo.page_size) * fsinfo.page_size; |