diff options
| author | 2018-07-02 10:20:50 -0600 | |
|---|---|---|
| committer | 2018-07-02 21:45:47 -0400 | |
| commit | 0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b (patch) | |
| tree | aba03bf491181cf741420dd1445bd5399e48a3af /src/core/file_sys | |
| parent | Rename logging macro back to LOG_* (diff) | |
| download | yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.gz yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.xz yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.zip | |
Update clang format
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/partition_filesystem.cpp | 4 | ||||
| -rw-r--r-- | src/core/file_sys/program_metadata.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/romfs_filesystem.cpp | 12 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp index ebbc0b252..46d438aca 100644 --- a/src/core/file_sys/partition_filesystem.cpp +++ b/src/core/file_sys/partition_filesystem.cpp | |||
| @@ -129,8 +129,8 @@ void PartitionFilesystem::Print() const { | |||
| 129 | LOG_DEBUG(Service_FS, "Files: {}", pfs_header.num_entries); | 129 | LOG_DEBUG(Service_FS, "Files: {}", pfs_header.num_entries); |
| 130 | for (u32 i = 0; i < pfs_header.num_entries; i++) { | 130 | for (u32 i = 0; i < pfs_header.num_entries; i++) { |
| 131 | LOG_DEBUG(Service_FS, " > File {}: {} (0x{:X} bytes, at 0x{:X})", i, | 131 | LOG_DEBUG(Service_FS, " > File {}: {} (0x{:X} bytes, at 0x{:X})", i, |
| 132 | pfs_entries[i].name.c_str(), pfs_entries[i].fs_entry.size, | 132 | pfs_entries[i].name.c_str(), pfs_entries[i].fs_entry.size, |
| 133 | GetFileOffset(pfs_entries[i].name)); | 133 | GetFileOffset(pfs_entries[i].name)); |
| 134 | } | 134 | } |
| 135 | } | 135 | } |
| 136 | } // namespace FileSys | 136 | } // namespace FileSys |
diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp index a17268b2c..226811115 100644 --- a/src/core/file_sys/program_metadata.cpp +++ b/src/core/file_sys/program_metadata.cpp | |||
| @@ -83,7 +83,7 @@ void ProgramMetadata::Print() const { | |||
| 83 | LOG_DEBUG(Service_FS, "Process category: {}", npdm_header.process_category); | 83 | LOG_DEBUG(Service_FS, "Process category: {}", npdm_header.process_category); |
| 84 | LOG_DEBUG(Service_FS, "Flags: 0x{:02X}", npdm_header.flags); | 84 | LOG_DEBUG(Service_FS, "Flags: 0x{:02X}", npdm_header.flags); |
| 85 | LOG_DEBUG(Service_FS, " > 64-bit instructions: {}", | 85 | LOG_DEBUG(Service_FS, " > 64-bit instructions: {}", |
| 86 | npdm_header.has_64_bit_instructions ? "YES" : "NO"); | 86 | npdm_header.has_64_bit_instructions ? "YES" : "NO"); |
| 87 | 87 | ||
| 88 | auto address_space = "Unknown"; | 88 | auto address_space = "Unknown"; |
| 89 | switch (npdm_header.address_space_type) { | 89 | switch (npdm_header.address_space_type) { |
diff --git a/src/core/file_sys/romfs_filesystem.cpp b/src/core/file_sys/romfs_filesystem.cpp index 4dbd6a786..83162622b 100644 --- a/src/core/file_sys/romfs_filesystem.cpp +++ b/src/core/file_sys/romfs_filesystem.cpp | |||
| @@ -28,22 +28,21 @@ ResultCode RomFS_FileSystem::DeleteFile(const std::string& path) const { | |||
| 28 | 28 | ||
| 29 | ResultCode RomFS_FileSystem::RenameFile(const std::string& src_path, | 29 | ResultCode RomFS_FileSystem::RenameFile(const std::string& src_path, |
| 30 | const std::string& dest_path) const { | 30 | const std::string& dest_path) const { |
| 31 | LOG_CRITICAL(Service_FS, "Attempted to rename a file within an ROMFS archive ({}).", | 31 | LOG_CRITICAL(Service_FS, "Attempted to rename a file within an ROMFS archive ({}).", GetName()); |
| 32 | GetName()); | ||
| 33 | // TODO(wwylele): Use correct error code | 32 | // TODO(wwylele): Use correct error code |
| 34 | return ResultCode(-1); | 33 | return ResultCode(-1); |
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | ResultCode RomFS_FileSystem::DeleteDirectory(const Path& path) const { | 36 | ResultCode RomFS_FileSystem::DeleteDirectory(const Path& path) const { |
| 38 | LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an ROMFS archive ({}).", | 37 | LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an ROMFS archive ({}).", |
| 39 | GetName()); | 38 | GetName()); |
| 40 | // TODO(wwylele): Use correct error code | 39 | // TODO(wwylele): Use correct error code |
| 41 | return ResultCode(-1); | 40 | return ResultCode(-1); |
| 42 | } | 41 | } |
| 43 | 42 | ||
| 44 | ResultCode RomFS_FileSystem::DeleteDirectoryRecursively(const Path& path) const { | 43 | ResultCode RomFS_FileSystem::DeleteDirectoryRecursively(const Path& path) const { |
| 45 | LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an ROMFS archive ({}).", | 44 | LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an ROMFS archive ({}).", |
| 46 | GetName()); | 45 | GetName()); |
| 47 | // TODO(wwylele): Use correct error code | 46 | // TODO(wwylele): Use correct error code |
| 48 | return ResultCode(-1); | 47 | return ResultCode(-1); |
| 49 | } | 48 | } |
| @@ -56,14 +55,13 @@ ResultCode RomFS_FileSystem::CreateFile(const std::string& path, u64 size) const | |||
| 56 | 55 | ||
| 57 | ResultCode RomFS_FileSystem::CreateDirectory(const std::string& path) const { | 56 | ResultCode RomFS_FileSystem::CreateDirectory(const std::string& path) const { |
| 58 | LOG_CRITICAL(Service_FS, "Attempted to create a directory in an ROMFS archive ({}).", | 57 | LOG_CRITICAL(Service_FS, "Attempted to create a directory in an ROMFS archive ({}).", |
| 59 | GetName()); | 58 | GetName()); |
| 60 | // TODO(wwylele): Use correct error code | 59 | // TODO(wwylele): Use correct error code |
| 61 | return ResultCode(-1); | 60 | return ResultCode(-1); |
| 62 | } | 61 | } |
| 63 | 62 | ||
| 64 | ResultCode RomFS_FileSystem::RenameDirectory(const Path& src_path, const Path& dest_path) const { | 63 | ResultCode RomFS_FileSystem::RenameDirectory(const Path& src_path, const Path& dest_path) const { |
| 65 | LOG_CRITICAL(Service_FS, "Attempted to rename a file within an ROMFS archive ({}).", | 64 | LOG_CRITICAL(Service_FS, "Attempted to rename a file within an ROMFS archive ({}).", GetName()); |
| 66 | GetName()); | ||
| 67 | // TODO(wwylele): Use correct error code | 65 | // TODO(wwylele): Use correct error code |
| 68 | return ResultCode(-1); | 66 | return ResultCode(-1); |
| 69 | } | 67 | } |