From: Eric Biggers <ebiggers@kernel.org>
To: linux-ext4@vger.kernel.org
Cc: Lukas Czerner <lczerner@redhat.com>
Subject: [PATCH 24/38] lib/support: clean up definition of flags_array
Date: Sat, 21 Jan 2023 12:32:16 -0800 [thread overview]
Message-ID: <20230121203230.27624-25-ebiggers@kernel.org> (raw)
In-Reply-To: <20230121203230.27624-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Add braces to address the following compiler warning with gcc -Wall:
print_fs_flags.c:24:42: warning: missing braces around initializer [-Wmissing-braces]
24 | static struct flags_name flags_array[] = {
| ^
Also add 'const', and add an explicit NULL in the last entry.
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
lib/support/print_fs_flags.c | 60 ++++++++++++++++++------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/lib/support/print_fs_flags.c b/lib/support/print_fs_flags.c
index e54acc04b..f47cd6653 100644
--- a/lib/support/print_fs_flags.c
+++ b/lib/support/print_fs_flags.c
@@ -21,40 +21,40 @@ struct flags_name {
const char *name;
};
-static struct flags_name flags_array[] = {
- EXT2_FLAG_RW, "EXT2_FLAG_RW",
- EXT2_FLAG_CHANGED, "EXT2_FLAG_CHANGED",
- EXT2_FLAG_DIRTY, "EXT2_FLAG_DIRTY",
- EXT2_FLAG_VALID, "EXT2_FLAG_VALID",
- EXT2_FLAG_IB_DIRTY, "EXT2_FLAG_IB_DIRTY",
- EXT2_FLAG_BB_DIRTY, "EXT2_FLAG_BB_DIRTY",
- EXT2_FLAG_SWAP_BYTES, "EXT2_FLAG_SWAP_BYTES",
- EXT2_FLAG_SWAP_BYTES_READ, "EXT2_FLAG_SWAP_BYTES_READ",
- EXT2_FLAG_SWAP_BYTES_WRITE, "EXT2_FLAG_SWAP_BYTES_WRITE",
- EXT2_FLAG_MASTER_SB_ONLY, "EXT2_FLAG_MASTER_SB_ONLY",
- EXT2_FLAG_FORCE, "EXT2_FLAG_FORCE",
- EXT2_FLAG_SUPER_ONLY, "EXT2_FLAG_SUPER_ONLY",
- EXT2_FLAG_JOURNAL_DEV_OK, "EXT2_FLAG_JOURNAL_DEV_OK",
- EXT2_FLAG_IMAGE_FILE, "EXT2_FLAG_IMAGE_FILE",
- EXT2_FLAG_EXCLUSIVE, "EXT2_FLAG_EXCLUSIVE",
- EXT2_FLAG_SOFTSUPP_FEATURES, "EXT2_FLAG_SOFTSUPP_FEATURES",
- EXT2_FLAG_NOFREE_ON_ERROR, "EXT2_FLAG_NOFREE_ON_ERROR",
- EXT2_FLAG_64BITS, "EXT2_FLAG_64BITS",
- EXT2_FLAG_PRINT_PROGRESS, "EXT2_FLAG_PRINT_PROGRESS",
- EXT2_FLAG_DIRECT_IO, "EXT2_FLAG_DIRECT_IO",
- EXT2_FLAG_SKIP_MMP, "EXT2_FLAG_SKIP_MMP",
- EXT2_FLAG_IGNORE_CSUM_ERRORS, "EXT2_FLAG_IGNORE_CSUM_ERRORS",
- EXT2_FLAG_SHARE_DUP, "EXT2_FLAG_SHARE_DUP",
- EXT2_FLAG_IGNORE_SB_ERRORS, "EXT2_FLAG_IGNORE_SB_ERRORS",
- EXT2_FLAG_BBITMAP_TAIL_PROBLEM, "EXT2_FLAG_BBITMAP_TAIL_PROBLEM",
- EXT2_FLAG_IBITMAP_TAIL_PROBLEM, "EXT2_FLAG_IBITMAP_TAIL_PROBLEM",
- EXT2_FLAG_THREADS, "EXT2_FLAG_THREADS",
- 0
+static const struct flags_name flags_array[] = {
+ { EXT2_FLAG_RW, "EXT2_FLAG_RW" },
+ { EXT2_FLAG_CHANGED, "EXT2_FLAG_CHANGED" },
+ { EXT2_FLAG_DIRTY, "EXT2_FLAG_DIRTY" },
+ { EXT2_FLAG_VALID, "EXT2_FLAG_VALID" },
+ { EXT2_FLAG_IB_DIRTY, "EXT2_FLAG_IB_DIRTY" },
+ { EXT2_FLAG_BB_DIRTY, "EXT2_FLAG_BB_DIRTY" },
+ { EXT2_FLAG_SWAP_BYTES, "EXT2_FLAG_SWAP_BYTES" },
+ { EXT2_FLAG_SWAP_BYTES_READ, "EXT2_FLAG_SWAP_BYTES_READ" },
+ { EXT2_FLAG_SWAP_BYTES_WRITE, "EXT2_FLAG_SWAP_BYTES_WRITE" },
+ { EXT2_FLAG_MASTER_SB_ONLY, "EXT2_FLAG_MASTER_SB_ONLY" },
+ { EXT2_FLAG_FORCE, "EXT2_FLAG_FORCE" },
+ { EXT2_FLAG_SUPER_ONLY, "EXT2_FLAG_SUPER_ONLY" },
+ { EXT2_FLAG_JOURNAL_DEV_OK, "EXT2_FLAG_JOURNAL_DEV_OK" },
+ { EXT2_FLAG_IMAGE_FILE, "EXT2_FLAG_IMAGE_FILE" },
+ { EXT2_FLAG_EXCLUSIVE, "EXT2_FLAG_EXCLUSIVE" },
+ { EXT2_FLAG_SOFTSUPP_FEATURES, "EXT2_FLAG_SOFTSUPP_FEATURES" },
+ { EXT2_FLAG_NOFREE_ON_ERROR, "EXT2_FLAG_NOFREE_ON_ERROR" },
+ { EXT2_FLAG_64BITS, "EXT2_FLAG_64BITS" },
+ { EXT2_FLAG_PRINT_PROGRESS, "EXT2_FLAG_PRINT_PROGRESS" },
+ { EXT2_FLAG_DIRECT_IO, "EXT2_FLAG_DIRECT_IO" },
+ { EXT2_FLAG_SKIP_MMP, "EXT2_FLAG_SKIP_MMP" },
+ { EXT2_FLAG_IGNORE_CSUM_ERRORS, "EXT2_FLAG_IGNORE_CSUM_ERRORS" },
+ { EXT2_FLAG_SHARE_DUP, "EXT2_FLAG_SHARE_DUP" },
+ { EXT2_FLAG_IGNORE_SB_ERRORS, "EXT2_FLAG_IGNORE_SB_ERRORS" },
+ { EXT2_FLAG_BBITMAP_TAIL_PROBLEM, "EXT2_FLAG_BBITMAP_TAIL_PROBLEM" },
+ { EXT2_FLAG_IBITMAP_TAIL_PROBLEM, "EXT2_FLAG_IBITMAP_TAIL_PROBLEM" },
+ { EXT2_FLAG_THREADS, "EXT2_FLAG_THREADS" },
+ { 0, NULL },
};
void print_fs_flags(FILE * f, unsigned long flags)
{
- struct flags_name *fp;
+ const struct flags_name *fp;
int first = 1, pos = 16;
for (fp = flags_array; fp->flag != 0; fp++) {
--
2.39.0
next prev parent reply other threads:[~2023-01-21 20:37 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-21 20:31 [PATCH 00/38] e2fsprogs: misc fixes, and add a GitHub Actions file Eric Biggers
2023-01-21 20:31 ` [PATCH 01/38] configure.ac: only use Windows I/O manager on native Windows Eric Biggers
2023-01-21 20:31 ` [PATCH 02/38] configure.ac: disable tdb by default on Windows Eric Biggers
2023-01-21 20:31 ` [PATCH 03/38] configure.ac: automatically add include/mingw/ headers Eric Biggers
2023-01-21 20:31 ` [PATCH 04/38] configure: regenerate Eric Biggers
2023-01-21 20:31 ` [PATCH 05/38] config/install-sh: update to latest version Eric Biggers
2023-01-21 20:31 ` [PATCH 06/38] lib, misc: eliminate dependency on Winsock Eric Biggers
2023-01-21 20:31 ` [PATCH 07/38] lib/blkid: remove 32-bit x86 byteswap assembly Eric Biggers
2023-01-24 18:21 ` Andreas Dilger
2023-01-21 20:32 ` [PATCH 08/38] lib/blkid: fix unaligned access to hfs_mdb Eric Biggers
2023-01-21 20:32 ` [PATCH 09/38] lib/blkid: fix -Wunused-variable warning in blkid_get_dev_size() Eric Biggers
2023-01-21 20:32 ` [PATCH 10/38] lib/blkid: suppress -Wunused-result warning in blkid_flush_cache() Eric Biggers
2023-01-21 20:32 ` [PATCH 11/38] lib/blkid: suppress -Wstringop-truncation warning in blkid_strndup() Eric Biggers
2023-01-21 20:32 ` [PATCH 12/38] lib/e2p: fix a -Wunused-variable warning in getflags() Eric Biggers
2023-01-21 20:32 ` [PATCH 13/38] lib/{e2p,ss}: remove manual declarations of errno Eric Biggers
2023-01-21 20:32 ` [PATCH 14/38] lib/et: fix "unused variable" warnings when !HAVE_FCNTL Eric Biggers
2023-01-21 20:32 ` [PATCH 15/38] lib/ext2fs: remove 32-bit x86 bitops assembly Eric Biggers
2023-01-21 20:32 ` [PATCH 16/38] lib/ext2fs: consistently use #ifdefs in ext2fs_print_bmap_statistics() Eric Biggers
2023-01-21 20:32 ` [PATCH 17/38] lib/ext2fs: remove unused variable in ext2fs_xattrs_read_inode() Eric Biggers
2023-01-21 20:32 ` [PATCH 18/38] lib/ext2fs: fix a printf format specifier in file_test() Eric Biggers
2023-01-21 20:32 ` [PATCH 19/38] lib/ext2fs: fix two compiler warnings in windows_io.c Eric Biggers
2023-01-21 20:32 ` [PATCH 20/38] lib/ext2fs: fix a -Wpointer-sign warning in ext2fs_mmp_start() Eric Biggers
2023-01-21 20:32 ` [PATCH 21/38] lib/{ext2fs,support}: fix 32-bit Windows build Eric Biggers
2023-01-21 20:32 ` [PATCH 22/38] lib/ss: fix 'make install' by creating man1dir Eric Biggers
2023-01-21 20:32 ` [PATCH 23/38] lib/support: remove unused label in get_devname() Eric Biggers
2023-01-21 20:32 ` Eric Biggers [this message]
2023-01-21 20:32 ` [PATCH 25/38] lib/uuid: remove conflicting Windows implementation of gettimeofday() Eric Biggers
2023-01-21 20:32 ` [PATCH 26/38] e2fsck: use real functions for kernel slab functions Eric Biggers
2023-01-21 20:32 ` [PATCH 27/38] misc/create_inode: fix -Wunused-variable warnings in __populate_fs() Eric Biggers
2023-01-21 20:32 ` [PATCH 28/38] misc/create_inode: simplify logic in scandir() Eric Biggers
2023-01-21 20:32 ` [PATCH 29/38] misc/e4defrag: fix -Wstringop-truncation warnings Eric Biggers
2023-01-21 20:32 ` [PATCH 30/38] misc/fuse2fs: avoid error-prone strncpy() pattern Eric Biggers
2023-01-21 20:32 ` [PATCH 31/38] misc/mk_hugefiles: simplify get_partition_start() Eric Biggers
2023-01-21 20:32 ` [PATCH 32/38] misc/mke2fs: fix Windows build Eric Biggers
2023-01-21 20:32 ` [PATCH 33/38] misc/mke2fs: fix a -Wunused-variable warning in PRS() Eric Biggers
2023-01-21 20:32 ` [PATCH 34/38] misc/tune2fs: fix setting fsuuid::fsu_len Eric Biggers
2023-01-21 20:32 ` [PATCH 35/38] misc/tune2fs: fix -Wunused-variable warnings in handle_fslabel() Eric Biggers
2023-01-21 20:32 ` [PATCH 36/38] misc/util.c: enable MinGW alarm() when building for Windows Eric Biggers
2023-01-21 20:32 ` [PATCH 37/38] resize2fs: remove unused variable from adjust_superblock() Eric Biggers
2023-01-21 20:32 ` [PATCH 38/38] Add a configuration file for GitHub Actions Eric Biggers
2023-01-24 20:59 ` [PATCH 00/38] e2fsprogs: misc fixes, and add a GitHub Actions file Andreas Dilger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230121203230.27624-25-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).