summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/downloads/nsDownloadManager.cpp18
-rw-r--r--toolkit/components/places/nsAnnotationService.cpp8
-rw-r--r--toolkit/components/places/nsNavHistoryResult.cpp6
-rw-r--r--toolkit/components/satchel/nsFormFillController.cpp2
-rw-r--r--toolkit/mozapps/update/updater/updater.cpp4
-rw-r--r--toolkit/xre/nsUpdateDriver.cpp2
6 files changed, 20 insertions, 20 deletions
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
index 587c1ac8ab..d2eccc7b64 100644
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -491,7 +491,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to the next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 2: // Add referrer column to the database
{
@@ -506,7 +506,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to the next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 3: // This version adds a column to the database (entityID)
{
@@ -521,7 +521,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to the next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 4: // This version adds a column to the database (tempPath)
{
@@ -536,7 +536,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to the next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 5: // This version adds two columns for tracking transfer progress
{
@@ -556,7 +556,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to the next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 6: // This version adds three columns to DB (MIME type related info)
{
@@ -581,7 +581,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case 7: // This version adds a column to remember to auto-resume downloads
{
@@ -596,7 +596,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough to the next upgrade
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
// Warning: schema versions >=8 must take into account that they can
// be operating on schemas from unknown, future versions that have
@@ -631,7 +631,7 @@ nsDownloadManager::InitFileDB()
// Extra sanity checking for developers
#ifndef DEBUG
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case DM_SCHEMA_VERSION:
#endif
break;
@@ -648,7 +648,7 @@ nsDownloadManager::InitFileDB()
NS_ENSURE_SUCCESS(rv, rv);
}
// Fallthrough 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/toolkit/components/places/nsAnnotationService.cpp b/toolkit/components/places/nsAnnotationService.cpp
index 9d62bd34a8..9e42836144 100644
--- a/toolkit/components/places/nsAnnotationService.cpp
+++ b/toolkit/components/places/nsAnnotationService.cpp
@@ -211,7 +211,7 @@ nsAnnotationService::SetPageAnnotation(nsIURI* aURI,
return NS_OK;
}
// Fall through int64_t case otherwise.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case nsIDataType::VTYPE_INT64:
case nsIDataType::VTYPE_UINT64: {
@@ -224,7 +224,7 @@ nsAnnotationService::SetPageAnnotation(nsIURI* aURI,
return NS_OK;
}
// Fall through double case otherwise.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case nsIDataType::VTYPE_FLOAT:
case nsIDataType::VTYPE_DOUBLE: {
@@ -296,7 +296,7 @@ nsAnnotationService::SetItemAnnotation(int64_t aItemId,
return NS_OK;
}
// Fall through int64_t case otherwise.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case nsIDataType::VTYPE_INT64:
case nsIDataType::VTYPE_UINT64: {
@@ -309,7 +309,7 @@ nsAnnotationService::SetItemAnnotation(int64_t aItemId,
return NS_OK;
}
// Fall through double case otherwise.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case nsIDataType::VTYPE_FLOAT:
case nsIDataType::VTYPE_DOUBLE: {
diff --git a/toolkit/components/places/nsNavHistoryResult.cpp b/toolkit/components/places/nsNavHistoryResult.cpp
index 64d06308fd..f07487dfcd 100644
--- a/toolkit/components/places/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/nsNavHistoryResult.cpp
@@ -2452,7 +2452,7 @@ nsNavHistoryQueryResultNode::OnVisit(nsIURI* aURI, int64_t aVisitId,
// Fall through to check the time, if the time is not present it will
// still match.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case QUERYUPDATE_TIME: {
@@ -2479,7 +2479,7 @@ nsNavHistoryQueryResultNode::OnVisit(nsIURI* aURI, int64_t aVisitId,
}
// Now we know that our visit satisfies the time range, fall through to
// the QUERYUPDATE_SIMPLE case below.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case QUERYUPDATE_SIMPLE: {
@@ -2917,7 +2917,7 @@ nsNavHistoryQueryResultNode::OnItemChanged(int64_t aItemId,
// folders titles.
if (mOptions->ResultType() != nsINavHistoryQueryOptions::RESULTS_AS_TAG_QUERY)
return NS_OK;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
default:
(void)Refresh();
}
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp
index aac1870490..69354930e0 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -1062,7 +1062,7 @@ nsFormFillController::KeyPress(nsIDOMEvent* aEvent)
if (isCtrl || isAlt || isMeta)
break;
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case nsIDOMKeyEvent::DOM_VK_UP:
case nsIDOMKeyEvent::DOM_VK_DOWN:
case nsIDOMKeyEvent::DOM_VK_LEFT:
diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
index f5f71935dc..073c0452fb 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -3764,7 +3764,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
LOG(("add_dir_entries: found a non-standard file: " LOG_S,
ftsdirEntry->fts_path));
// Fall through and try to remove as a file
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
// Files
case FTS_F:
@@ -3813,7 +3813,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
rv = OK;
break;
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case FTS_ERR:
rv = UNEXPECTED_FILE_OPERATION_ERROR;
diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index 577d74e6f5..69b6333b83 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -961,7 +961,7 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
break;
}
// Intentional fallthrough to ePendingUpdate.
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case ePendingUpdate: {
ApplyUpdate(greDir, updatesDir, statusFile, appDir, argc, argv, restart,