Bug 1701346 - CACHE: Revert QM_OR_ELSE_WARN to ordinary orElse in BodyCreateDir; r=asuth,dom-storage-reviewers,jstutte

Depends on D113068

Differential Revision: https://phabricator.services.mozilla.com/D113069
This commit is contained in:
Jan Varga 2021-04-24 08:58:32 +00:00
Родитель 1910186fa7
Коммит 8785c44342
1 изменённых файлов: 5 добавлений и 3 удалений

8
dom/cache/FileUtils.cpp поставляемый
Просмотреть файл

@ -104,9 +104,11 @@ nsresult BodyCreateDir(nsIFile& aBaseDir) {
CACHE_TRY_INSPECT(const auto& bodyDir,
CloneFileAndAppend(aBaseDir, kMorgueDirectory));
QM_TRY(
QM_OR_ELSE_WARN(ToResult(bodyDir->Create(nsIFile::DIRECTORY_TYPE, 0755)),
ErrToDefaultOkOrErr<NS_ERROR_FILE_ALREADY_EXISTS>));
// Callers call this function without checking if the directory already
// exists (idempotent usage). QM_OR_ELSE_WARN is not used here since we want
// to ignore NS_ERROR_FILE_ALREADY_EXISTS completely.
QM_TRY(ToResult(bodyDir->Create(nsIFile::DIRECTORY_TYPE, 0755))
.orElse(ErrToDefaultOkOrErr<NS_ERROR_FILE_ALREADY_EXISTS>));
return NS_OK;
}