From: Eric Sandeen <sandeen@redhat.com>
To: linux-ext4@vger.kernel.org
Cc: Eric Sandeen <sandeen@redhat.com>
Subject: [PATCH 08/25] e2fsprogs: annotate intentional fallthroughs in case statements
Date: Fri, 16 Sep 2011 15:49:23 -0500 [thread overview]
Message-ID: <1316206180-6375-9-git-send-email-sandeen@redhat.com> (raw)
In-Reply-To: <1316206180-6375-1-git-send-email-sandeen@redhat.com>
Using the /* fallthrough */ comment lets Coverity (and humans)
know that we really do want to fall through in these case statements.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
lib/e2p/feature.c | 1 +
lib/e2p/mntopts.c | 1 +
lib/e2p/parse_num.c | 3 +++
lib/ext2fs/dirhash.c | 3 +++
lib/ext2fs/extent.c | 2 ++
5 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c
index 5188483..ef4376a 100644
--- a/lib/e2p/feature.c
+++ b/lib/e2p/feature.c
@@ -307,6 +307,7 @@ int e2p_edit_feature2(const char *str, __u32 *compat_array, __u32 *ok_array,
case '-':
case '^':
neg++;
+ /* fallthrough */
case '+':
cp++;
break;
diff --git a/lib/e2p/mntopts.c b/lib/e2p/mntopts.c
index dfdd0ef..9d3879e 100644
--- a/lib/e2p/mntopts.c
+++ b/lib/e2p/mntopts.c
@@ -122,6 +122,7 @@ int e2p_edit_mntopts(const char *str, __u32 *mntopts, __u32 ok)
case '-':
case '^':
neg++;
+ /* fallthrough */
case '+':
cp++;
break;
diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
index 83a329a..9ca6799 100644
--- a/lib/e2p/parse_num.c
+++ b/lib/e2p/parse_num.c
@@ -26,10 +26,13 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
switch (*p) { /* Using fall-through logic */
case 'T': case 't':
num <<= 10;
+ /* fallthrough */
case 'G': case 'g':
num <<= 10;
+ /* fallthrough */
case 'M': case 'm':
num <<= 10;
+ /* fallthrough */
case 'K': case 'k':
num >>= log_block_size;
break;
diff --git a/lib/ext2fs/dirhash.c b/lib/ext2fs/dirhash.c
index a069706..5477bfb 100644
--- a/lib/ext2fs/dirhash.c
+++ b/lib/ext2fs/dirhash.c
@@ -217,11 +217,13 @@ errcode_t ext2fs_dirhash(int version, const char *name, int len,
switch (version) {
case EXT2_HASH_LEGACY_UNSIGNED:
unsigned_flag++;
+ /* fallthrough */
case EXT2_HASH_LEGACY:
hash = dx_hack_hash(name, len, unsigned_flag);
break;
case EXT2_HASH_HALF_MD4_UNSIGNED:
unsigned_flag++;
+ /* fallthrough */
case EXT2_HASH_HALF_MD4:
p = name;
while (len > 0) {
@@ -235,6 +237,7 @@ errcode_t ext2fs_dirhash(int version, const char *name, int len,
break;
case EXT2_HASH_TEA_UNSIGNED:
unsigned_flag++;
+ /* fallthrough */
case EXT2_HASH_TEA:
p = name;
while (len > 0) {
diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
index abb60dd..6d2afb0 100644
--- a/lib/ext2fs/extent.c
+++ b/lib/ext2fs/extent.c
@@ -373,9 +373,11 @@ retry:
case EXT2_EXTENT_ROOT:
handle->level = 0;
path = handle->path + handle->level;
+ /* fallthrough */
case EXT2_EXTENT_FIRST_SIB:
path->left = path->entries;
path->curr = 0;
+ /* fallthrough */
case EXT2_EXTENT_NEXT_SIB:
if (path->left <= 0)
return EXT2_ET_EXTENT_NO_NEXT;
--
1.7.4.1
next prev parent reply other threads:[~2011-09-16 20:49 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-16 20:49 [PATCH 00/25] e2fsprogs: Misc cleanups & fixes Eric Sandeen
2011-09-16 20:49 ` [PATCH 01/25] libext2: Fix EXT2_LIB_SOFTSUPP masking Eric Sandeen
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 02/25] e2fsprogs: Remove impossible name_len tests Eric Sandeen
2011-09-16 22:30 ` Andreas Dilger
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 03/25] fsck: fix -C option parsing Eric Sandeen
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 04/25] mke2fs: remove impossible tests for null usage_types Eric Sandeen
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 05/25] libext2: move buf variable completely under ifdef Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 06/25] libext2fs: Potential null ptr deref in undo_err_handler_init Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 07/25] e2fsck: handle null fs in print_pathname() Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` Eric Sandeen [this message]
2011-09-16 22:53 ` [PATCH 08/25] e2fsprogs: annotate intentional fallthroughs in case statements Ted Ts'o
2011-09-16 20:49 ` [PATCH 09/25] uuidd: Add missing break to option case statement Eric Sandeen
2011-09-16 22:54 ` Ted Ts'o
2011-09-17 0:47 ` Eric Sandeen
2011-09-16 20:49 ` [PATCH 10/25] freefrag: fix up getopt " Eric Sandeen
2011-09-16 22:54 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 11/25] libe2p: reach unreachable code Eric Sandeen
2011-09-16 22:54 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 12/25] e2fsck: Don't store old_op from ehandler_operation if we don't restore it Eric Sandeen
2011-09-16 22:55 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 13/25] e2fsprogs: Fix some error cleanup path bugs Eric Sandeen
2011-09-16 22:55 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 14/25] subst: Fix free of uninit pointers Eric Sandeen
2011-09-16 22:56 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 15/25] filefrag: Fix uninitialized "expected" value Eric Sandeen
2011-09-16 22:56 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 16/25] e2fsck: remove extraneous memset Eric Sandeen
2011-09-16 22:56 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 17/25] mke2fs: Do not let -t or -T be specified more than once Eric Sandeen
2011-09-16 22:57 ` Ted Ts'o
2011-09-16 22:57 ` Ted Ts'o
2011-09-17 0:49 ` Eric Sandeen
2011-09-16 20:49 ` [PATCH 18/25] e2initrd_helper: Fix memory leak on error Eric Sandeen
2011-09-16 22:58 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 19/25] libext2: Fix leaks in write_bitmaps on error returns Eric Sandeen
2011-09-16 22:58 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 20/25] test_icount: fclose() before exit Eric Sandeen
2011-09-16 22:58 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 21/25] e2fsck: Fix leaks in error paths Eric Sandeen
2011-09-16 23:41 ` Ted Ts'o
2011-09-17 0:57 ` Eric Sandeen
2011-09-16 20:49 ` [PATCH 22/25] tune2fs: handle inode and/or block bitmap read failures in resize_inode() Eric Sandeen
2011-09-16 23:57 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 23/25] e2fsprogs: Don't try to close an fd which is negative Eric Sandeen
2011-09-16 23:57 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 24/25] e4defrag: Check error return of sysconf() Eric Sandeen
2011-09-16 23:57 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 25/25] mke2fs: free tdb_dir string if it came from the profile Eric Sandeen
2011-09-16 23:58 ` Ted Ts'o
2011-09-16 21:27 ` [PATCH 00/25] e2fsprogs: Misc cleanups & fixes Eric Sandeen
2011-09-16 22:05 ` Ted Ts'o
2011-09-16 22:27 ` Eric Sandeen
2011-09-16 23:49 ` Ted Ts'o
2011-09-17 0:58 ` Eric Sandeen
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=1316206180-6375-9-git-send-email-sandeen@redhat.com \
--to=sandeen@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).