summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar TheKoopaKingdom2017-05-24 19:51:31 -0400
committerGravatar TheKoopaKingdom2017-06-02 18:40:39 -0400
commit59de38b96525d1230df07de3d6cda422421fd883 (patch)
treededa62dae5c41e8424606c236f576e1b94f06236 /src
parentMoved whitelist checks from FS_User to the Archive_NCCH handler. (diff)
downloadyuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.gz
yuzu-59de38b96525d1230df07de3d6cda422421fd883.tar.xz
yuzu-59de38b96525d1230df07de3d6cda422421fd883.zip
Switched to the ERROR_NOT_FOUND constant from errors.h.
Diffstat (limited to 'src')
-rw-r--r--src/core/file_sys/archive_ncch.cpp4
-rw-r--r--src/core/hle/service/fs/archive.cpp3
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 @@
11#include "common/string_util.h" 11#include "common/string_util.h"
12#include "core/core.h" 12#include "core/core.h"
13#include "core/file_sys/archive_ncch.h" 13#include "core/file_sys/archive_ncch.h"
14#include "core/file_sys/errors.h"
14#include "core/file_sys/ivfc_archive.h" 15#include "core/file_sys/ivfc_archive.h"
15#include "core/hle/service/fs/archive.h" 16#include "core/hle/service/fs/archive.h"
16 17
@@ -71,8 +72,7 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_NCCH::Open(const Path&
71 "NG bad word list"); 72 "NG bad word list");
72 } 73 }
73 } 74 }
74 return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound, 75 return ERROR_NOT_FOUND;
75 ErrorLevel::Status);
76 } 76 }
77 auto size = file->GetSize(); 77 auto size = file->GetSize();
78 78
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
258 258
259 auto itr = id_code_map.find(id_code); 259 auto itr = id_code_map.find(id_code);
260 if (itr == id_code_map.end()) 260 if (itr == id_code_map.end())
261 return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound, 261 return FileSys::ERROR_NOT_FOUND;
262 ErrorLevel::Status);
263 262
264 CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path)); 263 CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path));
265 264