N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HLE/FS: Corrected some style concerns.

Browse source
This commit is contained in:
Subv 2016-01-16 17:01:01 -05:00 committed by Sean Maas
parent 1874676ec7
commit d0a52c783a
6 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/file_sys/archive_backend.h
View file

@ -172,7 +172,7 @@ public:
*/ */
virtual ResultCode Format(const Path& path, const FileSys::ArchiveFormatInfo& format_info) = 0; virtual ResultCode Format(const Path& path, const FileSys::ArchiveFormatInfo& format_info) = 0;
/* /**
* Retrieves the format info about the archive with the specified path * Retrieves the format info about the archive with the specified path
* @param path Path to the archive * @param path Path to the archive
* @return Format information about the archive or error code * @return Format information about the archive or error code

2
src/core/file_sys/archive_extsavedata.cpp
View file

@ -117,7 +117,7 @@ ResultVal<ArchiveFormatInfo> ArchiveFactory_ExtSaveData::GetFormatInfo(const Pat
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS, ErrorSummary::InvalidState, ErrorLevel::Status); return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS, ErrorSummary::InvalidState, ErrorLevel::Status);
} }
void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, u8* icon_data, u32 icon_size) { void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, const u8* icon_data, u32 icon_size) {
std::string game_path = FileSys::GetExtSaveDataPath(GetMountPoint(), path); std::string game_path = FileSys::GetExtSaveDataPath(GetMountPoint(), path);
FileUtil::IOFile icon_file(game_path + "icon", "wb+"); FileUtil::IOFile icon_file(game_path + "icon", "wb+");
icon_file.WriteBytes(icon_data, icon_size); icon_file.WriteBytes(icon_data, icon_size);

4
src/core/file_sys/archive_extsavedata.h
View file

@ -36,13 +36,13 @@ public:
const std::string& GetMountPoint() const { return mount_point; } const std::string& GetMountPoint() const { return mount_point; }
/* /**
* Writes the SMDH icon of the ExtSaveData to file * Writes the SMDH icon of the ExtSaveData to file
* @param path Path of this ExtSaveData * @param path Path of this ExtSaveData
* @param icon_data Binary data of the icon * @param icon_data Binary data of the icon
* @param icon_size Size of the icon data * @param icon_size Size of the icon data
*/ */
void WriteIcon(const Path& path, u8* icon_data, u32 icon_size); void WriteIcon(const Path& path, const u8* icon_data, u32 icon_size);
private: private:
/** /**

1
src/core/hle/service/cfg/cfg.cpp
View file

@ -309,6 +309,7 @@ ResultCode UpdateConfigNANDSavegame() {
ResultCode FormatConfig() { ResultCode FormatConfig() {
ResultCode res = DeleteConfigNANDSaveFile(); ResultCode res = DeleteConfigNANDSaveFile();
// The delete command fails if the file doesn't exist, so we have to check that too
if (!res.IsSuccess() && res.description != ErrorDescription::FS_NotFound) if (!res.IsSuccess() && res.description != ErrorDescription::FS_NotFound)
return res; return res;
// Delete the old data // Delete the old data

5
src/core/hle/service/fs/archive.cpp
View file

@ -308,11 +308,8 @@ ResultVal<Kernel::SharedPtr<File>> OpenFileFromArchive(ArchiveHandle archive_han
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
auto backend = archive->OpenFile(path, mode); auto backend = archive->OpenFile(path, mode);
if (backend.Failed()) { if (backend.Failed())
return backend.Code(); return backend.Code();
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS,
ErrorSummary::NotFound, ErrorLevel::Status);
}
auto file = Kernel::SharedPtr<File>(new File(backend.MoveFrom(), path)); auto file = Kernel::SharedPtr<File>(new File(backend.MoveFrom(), path));
return MakeResult<Kernel::SharedPtr<File>>(std::move(file)); return MakeResult<Kernel::SharedPtr<File>>(std::move(file));

2
src/core/hle/service/fs/archive.h
View file

@ -183,7 +183,7 @@ ResultVal<u64> GetFreeBytesInArchive(ArchiveHandle archive_handle);
*/ */
ResultCode FormatArchive(ArchiveIdCode id_code, const FileSys::ArchiveFormatInfo& format_info, const FileSys::Path& path = FileSys::Path()); ResultCode FormatArchive(ArchiveIdCode id_code, const FileSys::ArchiveFormatInfo& format_info, const FileSys::Path& path = FileSys::Path());
/* /**
* Retrieves the format info about the archive of the specified type and path. * Retrieves the format info about the archive of the specified type and path.
* The format info is supplied by the client code when creating archives. * The format info is supplied by the client code when creating archives.
* @param id_code The id of the archive * @param id_code The id of the archive