From f60117b41d5433be1b4a96d82cd11d0c3dce9b63 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Apr 2018 18:00:21 +0200 Subject: New upstream version 1.11.3 --- shared/nm-utils/siphash24.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'shared/nm-utils/siphash24.c') diff --git a/shared/nm-utils/siphash24.c b/shared/nm-utils/siphash24.c index 3a5a635d..8e59afb2 100644 --- a/shared/nm-utils/siphash24.c +++ b/shared/nm-utils/siphash24.c @@ -19,7 +19,8 @@ #include "nm-default.h" -#define assert(cond) nm_assert (cond) +#define assert(cond) nm_assert (cond) +#define _fallthrough_ _nm_fallthrough #include @@ -130,25 +131,25 @@ void siphash24_compress(const void *_in, size_t inlen, struct siphash *state) { switch (left) { case 7: state->padding |= ((uint64_t) in[6]) << 48; - /* fall through */ + _fallthrough_; case 6: state->padding |= ((uint64_t) in[5]) << 40; - /* fall through */ + _fallthrough_; case 5: state->padding |= ((uint64_t) in[4]) << 32; - /* fall through */ + _fallthrough_; case 4: state->padding |= ((uint64_t) in[3]) << 24; - /* fall through */ + _fallthrough_; case 3: state->padding |= ((uint64_t) in[2]) << 16; - /* fall through */ + _fallthrough_; case 2: state->padding |= ((uint64_t) in[1]) << 8; - /* fall through */ + _fallthrough_; case 1: state->padding |= ((uint64_t) in[0]); - /* fall through */ + _fallthrough_; case 0: break; } -- cgit 1.3.0-6-gf8a5