summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
commit14cd5182c5f64c43581c82db8c958369152226ac (patch)
tree57f150ba2707f29214eeb9b1eaad2373780d1b15 /sal
parente4bb2b4f4875c15bd68297b5be716edd6859841e (diff)
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/security.cxx2
-rw-r--r--sal/rtl/digest.cxx14
-rw-r--r--sal/rtl/uri.cxx2
3 files changed, 8 insertions, 10 deletions
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index e4ff675a6bc2..8ea26db0e175 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -132,7 +132,7 @@ oslSecurity SAL_CALL osl_getCurrentSecurity()
if (found != nullptr) {
return p;
}
- /* fall through */
+ SAL_FALLTHROUGH;
default:
deleteSecurityImpl(p);
return nullptr;
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index f5eae7249a6f..51cef8198037 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -702,13 +702,12 @@ static void endMD5 (DigestContextMD5 *ctx)
switch (ctx->m_nDatLen & 0x03)
{
case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 3: X[i] |= ((sal_uInt32)(*p)) << 24L;
- /* fallthrough */
}
i += 1;
@@ -1157,13 +1156,12 @@ static void endSHA (DigestContextSHA *ctx)
switch (ctx->m_nDatLen & 0x03)
{
case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
- /* fallthrough */
+ SAL_FALLTHROUGH;
case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
- /* fallthrough */
}
swapLong (X, i + 1);
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 0f3d6df52194..a77eef1ea7e8 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -605,7 +605,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText,
case rtl_UriDecodeToIuri:
eCharset = RTL_TEXTENCODING_UTF8;
- //fall-through
+ SAL_FALLTHROUGH;
default: // rtl_UriDecodeWithCharset, rtl_UriDecodeStrict
{
sal_Unicode const * p = pText->buffer;