diff options
| author | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-05-25 01:51:31 +0200 |
|---|---|---|
| committer | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-06-03 00:40:39 +0200 |
| commit | 59de38b96525d1230df07de3d6cda422421fd883 (patch) | |
| tree | deda62dae5c41e8424606c236f576e1b94f06236 /src/core | |
| parent | Moved whitelist checks from FS_User to the Archive_NCCH handler. (diff) | |
| download | yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.gz yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.bz2 yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.lz yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.xz yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.zst yuzu-59de38b96525d1230df07de3d6cda422421fd883.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/archive_ncch.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp index 84950f871..ad59c053e 100644 --- a/src/core/file_sys/archive_ncch.cpp +++ b/src/core/file_sys/archive_ncch.cpp @@ -11,6 +11,7 @@ #include "common/string_util.h" #include "core/core.h" #include "core/file_sys/archive_ncch.h" +#include "core/file_sys/errors.h" #include "core/file_sys/ivfc_archive.h" #include "core/hle/service/fs/archive.h" @@ -71,8 +72,7 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_NCCH::Open(const Path& "NG bad word list"); } } - return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound, - ErrorLevel::Status); + return ERROR_NOT_FOUND; } auto size = file->GetSize(); diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 6d1a49d92..40d52f54b 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -258,8 +258,7 @@ ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archi auto itr = id_code_map.find(id_code); if (itr == id_code_map.end()) - return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound, - ErrorLevel::Status); + return FileSys::ERROR_NOT_FOUND; CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path)); |