diff options
Diffstat (limited to 'netwerk/cache2')
| -rw-r--r-- | netwerk/cache2/CacheHashUtils.cpp | 24 | ||||
| -rw-r--r-- | netwerk/cache2/CacheIndex.cpp | 6 | ||||
| -rw-r--r-- | netwerk/cache2/CacheStorageService.cpp | 2 |
3 files changed, 16 insertions, 16 deletions
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. |