diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-11-12 20:30:17 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-11-12 20:30:17 +0000 |
| commit | db4ddc5f6855fdd89cf2af9090f78fb7ebb7f032 (patch) | |
| tree | 8036ebc434967a0cde3de705a16faea54d117bfd /extensions | |
| parent | c789882a294d29b3e5450a972ad67c4839c75e23 (diff) | |
| parent | 9c75c8235e13e0f8309b11fa138253350bce0dd5 (diff) | |
| download | uxp-db4ddc5f6855fdd89cf2af9090f78fb7ebb7f032.tar.gz | |
Merge pull request 'Replace MOZ_FALLTHROUGH with [[fallthrough]]' (#2379) from 2343-fallthrough-work into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2379
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/cookie/nsCookiePermission.cpp | 2 | ||||
| -rw-r--r-- | extensions/cookie/nsPermissionManager.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/extensions/cookie/nsCookiePermission.cpp b/extensions/cookie/nsCookiePermission.cpp index 21e5553766..840523a31a 100644 --- a/extensions/cookie/nsCookiePermission.cpp +++ b/extensions/cookie/nsCookiePermission.cpp @@ -190,7 +190,7 @@ nsCookiePermission::CanSetCookie(nsIURI *aURI, switch (perm) { case nsICookiePermission::ACCESS_SESSION: *aIsSession = true; - MOZ_FALLTHROUGH; + [[fallthrough]]; case nsICookiePermission::ACCESS_ALLOW: *aResult = true; diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index afdaea63f1..9a3426f635 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -935,7 +935,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // TODO: we want to make default version as version 2 in order to fix bug 784875. case 0: @@ -955,7 +955,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // Version 3->4 is the creation of the modificationTime field. case 3: @@ -973,7 +973,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // In version 5, host appId, and isInBrowserElement were merged into a // single origin entry @@ -1059,7 +1059,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // At this point, the version 5 table has been migrated to a version 6 table // We are guaranteed to have at least one of moz_hosts and moz_perms. If @@ -1216,7 +1216,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // The version 7-8 migration is the re-migration of localhost and ip-address // entries due to errors in the previous version 7 migration which caused @@ -1318,7 +1318,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // The version 8-9 migration removes the unnecessary backup moz-hosts database contents. // as the data no longer needs to be migrated @@ -1346,7 +1346,7 @@ nsPermissionManager::InitDB(bool aRemoveFile) } // fall through to the next upgrade - MOZ_FALLTHROUGH; + [[fallthrough]]; // current version. case HOSTS_SCHEMA_VERSION: |