summaryrefslogtreecommitdiff
path: root/netwerk
diff options
context:
space:
mode:
Diffstat (limited to 'netwerk')
-rw-r--r--netwerk/base/nsURLHelper.cpp2
-rw-r--r--netwerk/cache/nsDiskCacheDevice.cpp20
-rw-r--r--netwerk/cache2/CacheHashUtils.cpp24
-rw-r--r--netwerk/cache2/CacheIndex.cpp6
-rw-r--r--netwerk/cache2/CacheStorageService.cpp2
-rw-r--r--netwerk/cookie/nsCookieService.cpp14
-rw-r--r--netwerk/protocol/http/Http2Stream.cpp2
-rw-r--r--netwerk/protocol/http/HttpBaseChannel.cpp2
-rw-r--r--netwerk/protocol/http/nsHttpTransaction.cpp2
-rw-r--r--netwerk/protocol/websocket/WebSocketChannel.cpp2
-rw-r--r--netwerk/sctp/datachannel/DataChannel.h2
-rw-r--r--netwerk/streamconv/converters/mozTXTToHTMLConv.cpp6
-rw-r--r--netwerk/streamconv/converters/nsHTTPCompressConv.cpp2
13 files changed, 43 insertions, 43 deletions
diff --git a/netwerk/base/nsURLHelper.cpp b/netwerk/base/nsURLHelper.cpp
index 0ddbdb6a6a..1024b2ef53 100644
--- a/netwerk/base/nsURLHelper.cpp
+++ b/netwerk/base/nsURLHelper.cpp
@@ -427,7 +427,7 @@ net_ResolveRelativePath(const nsACString &relativePath,
case '#':
case '?':
stop = true;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case '/':
// delimiter found
if (name.EqualsLiteral("..")) {
diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp
index 05bd6e06f2..c18ad012af 100644
--- a/netwerk/cache/nsDiskCacheDevice.cpp
+++ b/netwerk/cache/nsDiskCacheDevice.cpp
@@ -303,17 +303,17 @@ nsDiskCache::Hash(const char * key, PLDHashNumber initval)
/*------------------------------------- handle the last 11 bytes */
c += length;
switch(len) { /* all the case statements fall through */
- case 11: c += (uint32_t(k[10])<<24); MOZ_FALLTHROUGH;
- case 10: c += (uint32_t(k[9])<<16); MOZ_FALLTHROUGH;
- case 9 : c += (uint32_t(k[8])<<8); MOZ_FALLTHROUGH;
+ case 11: c += (uint32_t(k[10])<<24); [[fallthrough]];
+ case 10: c += (uint32_t(k[9])<<16); [[fallthrough]];
+ case 9 : c += (uint32_t(k[8])<<8); [[fallthrough]];
/* the low-order byte of c is reserved for the length */
- case 8 : b += (uint32_t(k[7])<<24); MOZ_FALLTHROUGH;
- case 7 : b += (uint32_t(k[6])<<16); MOZ_FALLTHROUGH;
- case 6 : b += (uint32_t(k[5])<<8); MOZ_FALLTHROUGH;
- case 5 : b += k[4]; MOZ_FALLTHROUGH;
- case 4 : a += (uint32_t(k[3])<<24); MOZ_FALLTHROUGH;
- case 3 : a += (uint32_t(k[2])<<16); MOZ_FALLTHROUGH;
- case 2 : a += (uint32_t(k[1])<<8); MOZ_FALLTHROUGH;
+ case 8 : b += (uint32_t(k[7])<<24); [[fallthrough]];
+ case 7 : b += (uint32_t(k[6])<<16); [[fallthrough]];
+ case 6 : b += (uint32_t(k[5])<<8); [[fallthrough]];
+ case 5 : b += k[4]; [[fallthrough]];
+ case 4 : a += (uint32_t(k[3])<<24); [[fallthrough]];
+ case 3 : a += (uint32_t(k[2])<<16); [[fallthrough]];
+ case 2 : a += (uint32_t(k[1])<<8); [[fallthrough]];
case 1 : a += k[0];
/* case 0: nothing left to add */
}
diff --git a/netwerk/cache2/CacheHashUtils.cpp b/netwerk/cache2/CacheHashUtils.cpp
index 6783f0b869..3dd169c420 100644
--- a/netwerk/cache2/CacheHashUtils.cpp
+++ b/netwerk/cache2/CacheHashUtils.cpp
@@ -58,17 +58,17 @@ CacheHash::Hash(const char *aData, uint32_t aSize, uint32_t aInitval)
/*------------------------------------- handle the last 11 bytes */
c += aSize;
switch(len) { /* all the case statements fall through */
- case 11: c += (uint32_t(k[10])<<24); MOZ_FALLTHROUGH;
- case 10: c += (uint32_t(k[9])<<16); MOZ_FALLTHROUGH;
- case 9 : c += (uint32_t(k[8])<<8); MOZ_FALLTHROUGH;
+ case 11: c += (uint32_t(k[10])<<24); [[fallthrough]];
+ case 10: c += (uint32_t(k[9])<<16); [[fallthrough]];
+ case 9 : c += (uint32_t(k[8])<<8); [[fallthrough]];
/* the low-order byte of c is reserved for the length */
- case 8 : b += (uint32_t(k[7])<<24); MOZ_FALLTHROUGH;
- case 7 : b += (uint32_t(k[6])<<16); MOZ_FALLTHROUGH;
- case 6 : b += (uint32_t(k[5])<<8); MOZ_FALLTHROUGH;
- case 5 : b += k[4]; MOZ_FALLTHROUGH;
- case 4 : a += (uint32_t(k[3])<<24); MOZ_FALLTHROUGH;
- case 3 : a += (uint32_t(k[2])<<16); MOZ_FALLTHROUGH;
- case 2 : a += (uint32_t(k[1])<<8); MOZ_FALLTHROUGH;
+ case 8 : b += (uint32_t(k[7])<<24); [[fallthrough]];
+ case 7 : b += (uint32_t(k[6])<<16); [[fallthrough]];
+ case 6 : b += (uint32_t(k[5])<<8); [[fallthrough]];
+ case 5 : b += k[4]; [[fallthrough]];
+ case 4 : a += (uint32_t(k[3])<<24); [[fallthrough]];
+ case 3 : a += (uint32_t(k[2])<<16); [[fallthrough]];
+ case 2 : a += (uint32_t(k[1])<<8); [[fallthrough]];
case 1 : a += k[0];
/* case 0: nothing left to add */
}
@@ -158,8 +158,8 @@ CacheHash::Update(const char *aData, uint32_t aLen)
}
switch (aLen) {
- case 3: mBuf += data[2] << 16; MOZ_FALLTHROUGH;
- case 2: mBuf += data[1] << 8; MOZ_FALLTHROUGH;
+ case 3: mBuf += data[2] << 16; [[fallthrough]];
+ case 2: mBuf += data[1] << 8; [[fallthrough]];
case 1: mBuf += data[0];
}
diff --git a/netwerk/cache2/CacheIndex.cpp b/netwerk/cache2/CacheIndex.cpp
index 0c46647c63..1fae397278 100644
--- a/netwerk/cache2/CacheIndex.cpp
+++ b/netwerk/cache2/CacheIndex.cpp
@@ -152,7 +152,7 @@ private:
if (!mDoNotSearchInUpdates) {
entry = mIndex->mPendingUpdates.GetEntry(*mHash);
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case CacheIndex::BUILDING:
case CacheIndex::UPDATING:
case CacheIndex::READY:
@@ -459,7 +459,7 @@ CacheIndex::Shutdown()
switch (oldState) {
case WRITING:
index->FinishWrite(false, lock);
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case READY:
if (index->mIndexOnDiskIsValid && !index->mDontMarkIndexClean) {
if (!sanitize && NS_FAILED(index->WriteLogToDisk())) {
@@ -1153,7 +1153,7 @@ CacheIndex::HasEntry(const SHA1Sum::Hash &hash, EntryStatus *_retval, bool *_pin
case READING:
case WRITING:
entry = index->mPendingUpdates.GetEntry(hash);
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case BUILDING:
case UPDATING:
case READY:
diff --git a/netwerk/cache2/CacheStorageService.cpp b/netwerk/cache2/CacheStorageService.cpp
index 0ed854e916..9890ce4806 100644
--- a/netwerk/cache2/CacheStorageService.cpp
+++ b/netwerk/cache2/CacheStorageService.cpp
@@ -450,7 +450,7 @@ private:
}
mPass = ITERATE_METADATA;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case ITERATE_METADATA:
// Now grab the context iterator.
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index 2549ffaccb..d08f7fc3c5 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -992,7 +992,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
NS_ENSURE_SUCCESS(rv, RESULT_RETRY);
}
// Fall through to the next upgrade.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 2:
{
@@ -1051,7 +1051,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
NS_ENSURE_SUCCESS(rv, RESULT_RETRY);
}
// Fall through to the next upgrade.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 3:
{
@@ -1148,7 +1148,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
NS_ENSURE_SUCCESS(rv, RESULT_RETRY);
}
// Fall through to the next upgrade.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 4:
{
@@ -1196,7 +1196,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
("Upgraded database to schema version 5"));
}
// Fall through to the next upgrade.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 5:
{
@@ -1262,7 +1262,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
COOKIE_LOGSTRING(LogLevel::Debug,
("Upgraded database to schema version 6"));
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 6:
{
@@ -1322,7 +1322,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
// No more upgrades. Update the schema version.
rv = mDefaultDBState->dbConn->SetSchemaVersion(COOKIES_SCHEMA_VERSION);
NS_ENSURE_SUCCESS(rv, RESULT_RETRY);
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case COOKIES_SCHEMA_VERSION:
break;
@@ -1340,7 +1340,7 @@ nsCookieService::TryInitDB(bool aRecreateDB)
NS_ENSURE_SUCCESS(rv, RESULT_RETRY);
}
// fall through to downgrade check
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
// downgrading.
// if columns have been added to the table, we can still use the ones we
diff --git a/netwerk/protocol/http/Http2Stream.cpp b/netwerk/protocol/http/Http2Stream.cpp
index 9b8f13c2d2..bcb7f73362 100644
--- a/netwerk/protocol/http/Http2Stream.cpp
+++ b/netwerk/protocol/http/Http2Stream.cpp
@@ -1357,7 +1357,7 @@ Http2Stream::OnReadSegment(const char *buf,
mRequestBodyLenRemaining -= dataLength;
GenerateDataFrameHeader(dataLength, !mRequestBodyLenRemaining);
ChangeState(SENDING_BODY);
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case SENDING_BODY:
MOZ_ASSERT(mTxInlineFrameUsed, "OnReadSegment Send Data Header 0b");
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 0b4929bbc8..fe8bbc5efa 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -1577,7 +1577,7 @@ HttpBaseChannel::SetReferrerWithPolicy(nsIURI *referrer,
// No URL, so fall through to truncating the path and any query/ref off
// as well.
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
default: // (Pref limited to [0,2] enforced by clamp, MOZ_CRASH overkill.)
case 2: // scheme+host+port+/
spec.AppendLiteral("/");
diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
index 6c6865c239..6532adf24a 100644
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -1668,7 +1668,7 @@ nsHttpTransaction::HandleContentStart()
switch (mResponseHead->Status()) {
case 101:
mPreserveStream = true;
- MOZ_FALLTHROUGH; // to other no content cases:
+ [[fallthrough]]; // to other no content cases:
case 204:
case 205:
case 304:
diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
index 9fca09a087..d645a96afd 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -2153,7 +2153,7 @@ WebSocketChannel::PrimeNewOutgoingMessage()
msgType = kMsgTypeBinaryString;
// no break: fall down into binary string case
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case kMsgTypeBinaryString:
mOutHeader[0] = kFinalFragBit | nsIWebSocketFrame::OPCODE_BINARY;
diff --git a/netwerk/sctp/datachannel/DataChannel.h b/netwerk/sctp/datachannel/DataChannel.h
index 02dca930c5..db0e2f7f75 100644
--- a/netwerk/sctp/datachannel/DataChannel.h
+++ b/netwerk/sctp/datachannel/DataChannel.h
@@ -544,7 +544,7 @@ public:
case ON_DISCONNECTED:
// If we've disconnected, make sure we close all the streams - from mainthread!
mConnection->CloseAll();
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case ON_CHANNEL_CREATED:
case ON_CONNECTION:
// WeakPtr - only used/modified/nulled from MainThread so we can use a WeakPtr here
diff --git a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
index db23cca35f..c5be10b216 100644
--- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
@@ -53,7 +53,7 @@ mozTXTToHTMLConv::EscapeChar(const char16_t ch, nsString& aStringToAppendTo,
break;
}
// else fall through
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
default:
aStringToAppendTo += ch;
}
@@ -101,7 +101,7 @@ mozTXTToHTMLConv::EscapeStr(nsString& aInString, bool inAttribute)
break;
}
// else fall through
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
default:
i++;
}
@@ -512,7 +512,7 @@ mozTXTToHTMLConv::FindURL(const char16_t * aInString, int32_t aInLength, const u
{
case '@':
state[RFC2396E] = unchecked;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case '.':
state[abbreviated] = unchecked;
break;
diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
index b540240322..6030e1c8d6 100644
--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -291,7 +291,7 @@ nsHTTPCompressConv::OnDataAvailable(nsIRequest* request,
return NS_OK;
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case HTTP_COMPRESS_DEFLATE: