diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 17:01:22 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 17:01:22 +0200 |
commit | f01ba80990c96b8761079c363b87aea676e5acd9 (patch) | |
tree | 0dd039da10db2e5e662331fe8b2ec9ec4ff1bc0d /sal | |
parent | Add SAL_FALLTHROUGH, where apparently appropriate (diff) | |
download | core-f01ba80990c96b8761079c363b87aea676e5acd9.tar.gz core-f01ba80990c96b8761079c363b87aea676e5acd9.zip |
Add SAL_FALLTHROUGH, where apparently appropriate
Change-Id: Ib67f7cb71255a32810f09a6b7e528f024bbef9df
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/unx/socket.cxx | 1 | ||||
-rw-r--r-- | sal/rtl/cipher.cxx | 14 | ||||
-rw-r--r-- | sal/rtl/uri.cxx | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 02fb6c90c8e0..02000fbb3474 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -554,6 +554,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) && (pInetAddr1->sin_port == pInetAddr2->sin_port)) return true; + SAL_FALLTHROUGH; } default: diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 192309903b28..959aa8a3a7b3 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -47,12 +47,19 @@ switch ((n)) \ { \ case 8: (xr) = ((sal_uInt32)(*(--(c)))); \ + SAL_FALLTHROUGH; \ case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + SAL_FALLTHROUGH; \ case 6: (xr) |= ((sal_uInt32)(*(--(c)))) << 16L; \ + SAL_FALLTHROUGH; \ case 5: (xr) |= ((sal_uInt32)(*(--(c)))) << 24L; \ + SAL_FALLTHROUGH; \ case 4: (xl) = ((sal_uInt32)(*(--(c)))); \ + SAL_FALLTHROUGH; \ case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + SAL_FALLTHROUGH; \ case 2: (xl) |= ((sal_uInt32)(*(--(c)))) << 16L; \ + SAL_FALLTHROUGH; \ case 1: (xl) |= ((sal_uInt32)(*(--(c)))) << 24L; \ } \ } @@ -63,12 +70,19 @@ switch ((n)) \ { \ case 8: *(--(c)) = (sal_uInt8)(((xr) ) & 0xff); \ + SAL_FALLTHROUGH; \ case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8L) & 0xff); \ + SAL_FALLTHROUGH; \ case 6: *(--(c)) = (sal_uInt8)(((xr) >> 16L) & 0xff); \ + SAL_FALLTHROUGH; \ case 5: *(--(c)) = (sal_uInt8)(((xr) >> 24L) & 0xff); \ + SAL_FALLTHROUGH; \ case 4: *(--(c)) = (sal_uInt8)(((xl) ) & 0xff); \ + SAL_FALLTHROUGH; \ case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8L) & 0xff); \ + SAL_FALLTHROUGH; \ case 2: *(--(c)) = (sal_uInt8)(((xl) >> 16L) & 0xff); \ + SAL_FALLTHROUGH; \ case 1: *(--(c)) = (sal_uInt8)(((xl) >> 24L) & 0xff); \ } \ } diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index a77eef1ea7e8..aff2c774a6b3 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -624,6 +624,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText, writeEscapeOctet(pResult, &nCapacity, nUtf32); break; } + SAL_FALLTHROUGH; case EscapeNo: writeUcs4(pResult, &nCapacity, nUtf32); break; |