diff options
| author | 2016-01-16 17:01:01 -0500 | |
|---|---|---|
| committer | 2016-03-20 14:52:26 -0500 | |
| commit | 3aa42627a3a35d8a4fb9acdcced24977d1f269cd (patch) | |
| tree | 187e8911ae3b960c080f486bbf9fdbeeaea980bf /src/core/hle | |
| parent | HLE/FS: Fixed creating the config savefile when it doesn't exist. (diff) | |
| download | yuzu-3aa42627a3a35d8a4fb9acdcced24977d1f269cd.tar.gz yuzu-3aa42627a3a35d8a4fb9acdcced24977d1f269cd.tar.xz yuzu-3aa42627a3a35d8a4fb9acdcced24977d1f269cd.zip | |
HLE/FS: Corrected some style concerns.
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/fs/fs_user.cpp | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index bb2c55612..525432957 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp | |||
| @@ -310,6 +310,7 @@ ResultCode UpdateConfigNANDSavegame() { | |||
| 310 | 310 | ||
| 311 | ResultCode FormatConfig() { | 311 | ResultCode FormatConfig() { |
| 312 | ResultCode res = DeleteConfigNANDSaveFile(); | 312 | ResultCode res = DeleteConfigNANDSaveFile(); |
| 313 | // The delete command fails if the file doesn't exist, so we have to check that too | ||
| 313 | if (!res.IsSuccess() && res.description != ErrorDescription::FS_NotFound) | 314 | if (!res.IsSuccess() && res.description != ErrorDescription::FS_NotFound) |
| 314 | return res; | 315 | return res; |
| 315 | // Delete the old data | 316 | // Delete the old data |
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 63381250a..676a2ee56 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp | |||
| @@ -308,11 +308,8 @@ ResultVal<Kernel::SharedPtr<File>> OpenFileFromArchive(ArchiveHandle archive_han | |||
| 308 | return ERR_INVALID_HANDLE; | 308 | return ERR_INVALID_HANDLE; |
| 309 | 309 | ||
| 310 | auto backend = archive->OpenFile(path, mode); | 310 | auto backend = archive->OpenFile(path, mode); |
| 311 | if (backend.Failed()) { | 311 | if (backend.Failed()) |
| 312 | return backend.Code(); | 312 | return backend.Code(); |
| 313 | return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, | ||
| 314 | ErrorSummary::NotFound, ErrorLevel::Status); | ||
| 315 | } | ||
| 316 | 313 | ||
| 317 | auto file = Kernel::SharedPtr<File>(new File(backend.MoveFrom(), path)); | 314 | auto file = Kernel::SharedPtr<File>(new File(backend.MoveFrom(), path)); |
| 318 | return MakeResult<Kernel::SharedPtr<File>>(std::move(file)); | 315 | return MakeResult<Kernel::SharedPtr<File>>(std::move(file)); |
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index b17d7c902..006606740 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h | |||
| @@ -183,7 +183,7 @@ ResultVal<u64> GetFreeBytesInArchive(ArchiveHandle archive_handle); | |||
| 183 | */ | 183 | */ |
| 184 | ResultCode FormatArchive(ArchiveIdCode id_code, const FileSys::ArchiveFormatInfo& format_info, const FileSys::Path& path = FileSys::Path()); | 184 | ResultCode FormatArchive(ArchiveIdCode id_code, const FileSys::ArchiveFormatInfo& format_info, const FileSys::Path& path = FileSys::Path()); |
| 185 | 185 | ||
| 186 | /* | 186 | /** |
| 187 | * Retrieves the format info about the archive of the specified type and path. | 187 | * Retrieves the format info about the archive of the specified type and path. |
| 188 | * The format info is supplied by the client code when creating archives. | 188 | * The format info is supplied by the client code when creating archives. |
| 189 | * @param id_code The id of the archive | 189 | * @param id_code The id of the archive |
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index ff7a9975e..3ec7ceb30 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp | |||
| @@ -250,7 +250,7 @@ static void CreateFile(Service::Interface* self) { | |||
| 250 | 250 | ||
| 251 | FileSys::Path file_path(filename_type, filename_size, filename_ptr); | 251 | FileSys::Path file_path(filename_type, filename_size, filename_ptr); |
| 252 | 252 | ||
| 253 | LOG_DEBUG(Service_FS, "type=%d size=%lld data=%s", filename_type, filename_size, file_path.DebugStr().c_str()); | 253 | LOG_DEBUG(Service_FS, "type=%d size=%llu data=%s", filename_type, filename_size, file_path.DebugStr().c_str()); |
| 254 | 254 | ||
| 255 | cmd_buff[1] = CreateFileInArchive(archive_handle, file_path, file_size).raw; | 255 | cmd_buff[1] = CreateFileInArchive(archive_handle, file_path, file_size).raw; |
| 256 | } | 256 | } |