p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jffs2: avoid Wempty-body warnings 

Building with W=1 shows a few warnings for empty macros:

fs/jffs2/scan.c: In function 'jffs2_scan_xattr_node':
fs/jffs2/scan.c:378:66: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  378 |                 jffs2_sum_add_xattr_mem(s, rx, ofs - jeb->offset);
      |                                                                  ^
fs/jffs2/scan.c: In function 'jffs2_scan_xref_node':
fs/jffs2/scan.c:434:65: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  434 |                 jffs2_sum_add_xref_mem(s, rr, ofs - jeb->offset);
      |                                                                 ^
fs/jffs2/scan.c: In function 'jffs2_scan_eraseblock':
fs/jffs2/scan.c:893:88: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  893 |                                 jffs2_sum_add_padding_mem(s, je32_to_cpu(node->totlen));
      |                                                                                        ^

Change all these macros to 'do { } while (0)' statements to avoid the
warnings and make the code a little more robust.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Arnd Bergmann 2021-03-22 12:34:29 +01:00 committed by Richard Weinberger
parent 960b9a8a76
commit 81af4b7b53
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/jffs2/summary.h
View File

@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
#define jffs2_sum_active() (0) #define jffs2_sum_active() (0)
#define jffs2_sum_init(a) (0) #define jffs2_sum_init(a) (0)
#define jffs2_sum_exit(a) #define jffs2_sum_exit(a) do { } while (0)
#define jffs2_sum_disable_collecting(a) #define jffs2_sum_disable_collecting(a)
#define jffs2_sum_is_disabled(a) (0) #define jffs2_sum_is_disabled(a) (0)
#define jffs2_sum_reset_collected(a) #define jffs2_sum_reset_collected(a) do { } while (0)
#define jffs2_sum_add_kvec(a,b,c,d) (0) #define jffs2_sum_add_kvec(a,b,c,d) (0)
#define jffs2_sum_move_collected(a,b) #define jffs2_sum_move_collected(a,b) do { } while (0)
#define jffs2_sum_write_sumnode(a) (0) #define jffs2_sum_write_sumnode(a) (0)
#define jffs2_sum_add_padding_mem(a,b) #define jffs2_sum_add_padding_mem(a,b) do { } while (0)
#define jffs2_sum_add_inode_mem(a,b,c) #define jffs2_sum_add_inode_mem(a,b,c) do { } while (0)
#define jffs2_sum_add_dirent_mem(a,b,c) #define jffs2_sum_add_dirent_mem(a,b,c) do { } while (0)
#define jffs2_sum_add_xattr_mem(a,b,c) #define jffs2_sum_add_xattr_mem(a,b,c) do { } while (0)
#define jffs2_sum_add_xref_mem(a,b,c) #define jffs2_sum_add_xref_mem(a,b,c) do { } while (0)
#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
#endif /* CONFIG_JFFS2_SUMMARY */ #endif /* CONFIG_JFFS2_SUMMARY */