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/file_sys | |
| 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/file_sys')
| -rw-r--r-- | src/core/file_sys/archive_backend.h | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_extsavedata.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_extsavedata.h | 4 | ||||
| -rw-r--r-- | src/core/file_sys/archive_savedata.cpp | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h index 800ac1541..94cda172f 100644 --- a/src/core/file_sys/archive_backend.h +++ b/src/core/file_sys/archive_backend.h | |||
| @@ -172,7 +172,7 @@ public: | |||
| 172 | */ | 172 | */ |
| 173 | virtual ResultCode Format(const Path& path, const FileSys::ArchiveFormatInfo& format_info) = 0; | 173 | virtual ResultCode Format(const Path& path, const FileSys::ArchiveFormatInfo& format_info) = 0; |
| 174 | 174 | ||
| 175 | /* | 175 | /** |
| 176 | * Retrieves the format info about the archive with the specified path | 176 | * Retrieves the format info about the archive with the specified path |
| 177 | * @param path Path to the archive | 177 | * @param path Path to the archive |
| 178 | * @return Format information about the archive or error code | 178 | * @return Format information about the archive or error code |
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index e83a6153d..ca7fd5c5e 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp | |||
| @@ -117,7 +117,7 @@ ResultVal<ArchiveFormatInfo> ArchiveFactory_ExtSaveData::GetFormatInfo(const Pat | |||
| 117 | return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS, ErrorSummary::InvalidState, ErrorLevel::Status); | 117 | return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS, ErrorSummary::InvalidState, ErrorLevel::Status); |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, u8* icon_data, u32 icon_size) { | 120 | void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, const u8* icon_data, u32 icon_size) { |
| 121 | std::string game_path = FileSys::GetExtSaveDataPath(GetMountPoint(), path); | 121 | std::string game_path = FileSys::GetExtSaveDataPath(GetMountPoint(), path); |
| 122 | FileUtil::IOFile icon_file(game_path + "icon", "wb+"); | 122 | FileUtil::IOFile icon_file(game_path + "icon", "wb+"); |
| 123 | icon_file.WriteBytes(icon_data, icon_size); | 123 | icon_file.WriteBytes(icon_data, icon_size); |
diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h index 48e092ee7..1ebe0529f 100644 --- a/src/core/file_sys/archive_extsavedata.h +++ b/src/core/file_sys/archive_extsavedata.h | |||
| @@ -36,13 +36,13 @@ public: | |||
| 36 | 36 | ||
| 37 | const std::string& GetMountPoint() const { return mount_point; } | 37 | const std::string& GetMountPoint() const { return mount_point; } |
| 38 | 38 | ||
| 39 | /* | 39 | /** |
| 40 | * Writes the SMDH icon of the ExtSaveData to file | 40 | * Writes the SMDH icon of the ExtSaveData to file |
| 41 | * @param path Path of this ExtSaveData | 41 | * @param path Path of this ExtSaveData |
| 42 | * @param icon_data Binary data of the icon | 42 | * @param icon_data Binary data of the icon |
| 43 | * @param icon_size Size of the icon data | 43 | * @param icon_size Size of the icon data |
| 44 | */ | 44 | */ |
| 45 | void WriteIcon(const Path& path, u8* icon_data, u32 icon_size); | 45 | void WriteIcon(const Path& path, const u8* icon_data, u32 icon_size); |
| 46 | 46 | ||
| 47 | private: | 47 | private: |
| 48 | /** | 48 | /** |
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index 82f49af5d..c2d32ed7e 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp | |||
| @@ -26,14 +26,14 @@ static std::string GetSaveDataContainerPath(const std::string& sdmc_directory) { | |||
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | static std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) { | 28 | static std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) { |
| 29 | u32 high = program_id >> 32; | 29 | u32 high = (u32)(program_id >> 32); |
| 30 | u32 low = program_id & 0xFFFFFFFF; | 30 | u32 low = (u32)(program_id & 0xFFFFFFFF); |
| 31 | return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low); | 31 | return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low); |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | static std::string GetSaveDataMetadataPath(const std::string& mount_location, u64 program_id) { | 34 | static std::string GetSaveDataMetadataPath(const std::string& mount_location, u64 program_id) { |
| 35 | u32 high = program_id >> 32; | 35 | u32 high = (u32)(program_id >> 32); |
| 36 | u32 low = program_id & 0xFFFFFFFF; | 36 | u32 low = (u32)(program_id & 0xFFFFFFFF); |
| 37 | return Common::StringFromFormat("%s%08x/%08x/data/00000001.metadata", mount_location.c_str(), high, low); | 37 | return Common::StringFromFormat("%s%08x/%08x/data/00000001.metadata", mount_location.c_str(), high, low); |
| 38 | } | 38 | } |
| 39 | 39 | ||