aboutsummaryrefslogtreecommitdiff
path: root/src/ext/csiphash.c
diff options
context:
space:
mode:
authorAndreas Stieger <astieger@suse.com>2017-05-28 23:49:31 +0200
committerNick Mathewson <nickm@torproject.org>2017-05-30 08:33:27 -0400
commite5f4642db3f7cc2ff66d74a8837d0aa24034cdfa (patch)
treeec70b61965aeac739a8f9912a736f100135a86b3 /src/ext/csiphash.c
parentd1580ad49ba7a112021803428d5bdef2259b014e (diff)
downloadtor-e5f4642db3f7cc2ff66d74a8837d0aa24034cdfa.tar.gz
tor-e5f4642db3f7cc2ff66d74a8837d0aa24034cdfa.zip
Fix GCC 7 -Wimplicit-fallthrough warnings
Add magic comments recognized by default -Wimplicit-fallthrough=3 or break, as required.
Diffstat (limited to 'src/ext/csiphash.c')
-rw-r--r--src/ext/csiphash.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c
index 1029bbbad3..508e4f6ceb 100644
--- a/src/ext/csiphash.c
+++ b/src/ext/csiphash.c
@@ -88,13 +88,13 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k
}
switch (src_sz - blocks) {
- case 7: last7 |= (uint64_t)m[i + 6] << 48;
- case 6: last7 |= (uint64_t)m[i + 5] << 40;
- case 5: last7 |= (uint64_t)m[i + 4] << 32;
- case 4: last7 |= (uint64_t)m[i + 3] << 24;
- case 3: last7 |= (uint64_t)m[i + 2] << 16;
- case 2: last7 |= (uint64_t)m[i + 1] << 8;
- case 1: last7 |= (uint64_t)m[i + 0] ;
+ case 7: last7 |= (uint64_t)m[i + 6] << 48; /* Falls through. */
+ case 6: last7 |= (uint64_t)m[i + 5] << 40; /* Falls through. */
+ case 5: last7 |= (uint64_t)m[i + 4] << 32; /* Falls through. */
+ case 4: last7 |= (uint64_t)m[i + 3] << 24; /* Falls through. */
+ case 3: last7 |= (uint64_t)m[i + 2] << 16; /* Falls through. */
+ case 2: last7 |= (uint64_t)m[i + 1] << 8; /* Falls through. */
+ case 1: last7 |= (uint64_t)m[i + 0] ; /* Falls through. */
case 0:
default:;
}