mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	Merge pull request #2492 from Kloen/killing-warnings-HD1.5ReMIX
Fix OSX build warnings about unhandled enumeration values.
This commit is contained in:
		
						commit
						f111cd66ce
					
				
					 5 changed files with 48 additions and 0 deletions
				
			
		|  | @ -141,6 +141,26 @@ int main(int argc, char** argv) { | ||||||
|     case Core::System::ResultStatus::ErrorLoader: |     case Core::System::ResultStatus::ErrorLoader: | ||||||
|         LOG_CRITICAL(Frontend, "Failed to load ROM!"); |         LOG_CRITICAL(Frontend, "Failed to load ROM!"); | ||||||
|         return -1; |         return -1; | ||||||
|  |     case Core::System::ResultStatus::ErrorLoader_ErrorEncrypted: | ||||||
|  |         LOG_CRITICAL(Frontend, "The game that you are trying to load must be decrypted before " | ||||||
|  |                                "being used with Citra. \n\n For more information on dumping and " | ||||||
|  |                                "decrypting games, please refer to: " | ||||||
|  |                                "https://citra-emu.org/wiki/Dumping-Game-Cartridges"); | ||||||
|  |         return -1; | ||||||
|  |     case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: | ||||||
|  |         LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported."); | ||||||
|  |         return -1; | ||||||
|  |     case Core::System::ResultStatus::ErrorNotInitialized: | ||||||
|  |         LOG_CRITICAL(Frontend, "CPUCore not initialized"); | ||||||
|  |         return -1; | ||||||
|  |     case Core::System::ResultStatus::ErrorSystemMode: | ||||||
|  |         LOG_CRITICAL(Frontend, "Failed to determine system mode!"); | ||||||
|  |         return -1; | ||||||
|  |     case Core::System::ResultStatus::ErrorVideoCore: | ||||||
|  |         LOG_CRITICAL(Frontend, "VideoCore not initialized"); | ||||||
|  |         return -1; | ||||||
|  |     case Core::System::ResultStatus::Success: | ||||||
|  |         break; // Expected case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     while (emu_window->IsOpen()) { |     while (emu_window->IsOpen()) { | ||||||
|  |  | ||||||
|  | @ -107,6 +107,8 @@ public: | ||||||
|         case PathParser::NotFound: |         case PathParser::NotFound: | ||||||
|             LOG_ERROR(Service_FS, "%s not found", full_path.c_str()); |             LOG_ERROR(Service_FS, "%s not found", full_path.c_str()); | ||||||
|             return ERROR_FILE_NOT_FOUND; |             return ERROR_FILE_NOT_FOUND; | ||||||
|  |         case PathParser::FileFound: | ||||||
|  |             break; // Expected 'success' case
 | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         FileUtil::IOFile file(full_path, "r+b"); |         FileUtil::IOFile file(full_path, "r+b"); | ||||||
|  |  | ||||||
|  | @ -72,6 +72,8 @@ ResultVal<std::unique_ptr<FileBackend>> SDMCArchive::OpenFileBase(const Path& pa | ||||||
|             FileUtil::CreateEmptyFile(full_path); |             FileUtil::CreateEmptyFile(full_path); | ||||||
|         } |         } | ||||||
|         break; |         break; | ||||||
|  |     case PathParser::FileFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     FileUtil::IOFile file(full_path, mode.write_flag ? "r+b" : "rb"); |     FileUtil::IOFile file(full_path, mode.write_flag ? "r+b" : "rb"); | ||||||
|  | @ -106,6 +108,8 @@ ResultCode SDMCArchive::DeleteFile(const Path& path) const { | ||||||
|     case PathParser::DirectoryFound: |     case PathParser::DirectoryFound: | ||||||
|         LOG_ERROR(Service_FS, "%s is not a file", full_path.c_str()); |         LOG_ERROR(Service_FS, "%s is not a file", full_path.c_str()); | ||||||
|         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY_SDMC; |         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY_SDMC; | ||||||
|  |     case PathParser::FileFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (FileUtil::Delete(full_path)) { |     if (FileUtil::Delete(full_path)) { | ||||||
|  | @ -154,6 +158,8 @@ static ResultCode DeleteDirectoryHelper(const Path& path, const std::string& mou | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "Unexpected file in path %s", full_path.c_str()); |         LOG_ERROR(Service_FS, "Unexpected file in path %s", full_path.c_str()); | ||||||
|         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY_SDMC; |         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY_SDMC; | ||||||
|  |     case PathParser::DirectoryFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (deleter(full_path)) { |     if (deleter(full_path)) { | ||||||
|  | @ -197,6 +203,8 @@ ResultCode SDMCArchive::CreateFile(const FileSys::Path& path, u64 size) const { | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); |         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); | ||||||
|         return ERROR_ALREADY_EXISTS; |         return ERROR_ALREADY_EXISTS; | ||||||
|  |     case PathParser::NotFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (size == 0) { |     if (size == 0) { | ||||||
|  | @ -238,6 +246,8 @@ ResultCode SDMCArchive::CreateDirectory(const Path& path) const { | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); |         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); | ||||||
|         return ERROR_ALREADY_EXISTS; |         return ERROR_ALREADY_EXISTS; | ||||||
|  |     case PathParser::NotFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (FileUtil::CreateDir(mount_point + path.AsString())) { |     if (FileUtil::CreateDir(mount_point + path.AsString())) { | ||||||
|  | @ -281,6 +291,8 @@ ResultVal<std::unique_ptr<DirectoryBackend>> SDMCArchive::OpenDirectory(const Pa | ||||||
|     case PathParser::FileInPath: |     case PathParser::FileInPath: | ||||||
|         LOG_ERROR(Service_FS, "Unexpected file in path %s", full_path.c_str()); |         LOG_ERROR(Service_FS, "Unexpected file in path %s", full_path.c_str()); | ||||||
|         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY_SDMC; |         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY_SDMC; | ||||||
|  |     case PathParser::DirectoryFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     auto directory = std::make_unique<DiskDirectory>(full_path); |     auto directory = std::make_unique<DiskDirectory>(full_path); | ||||||
|  |  | ||||||
|  | @ -57,6 +57,8 @@ ResultVal<std::unique_ptr<FileBackend>> SaveDataArchive::OpenFile(const Path& pa | ||||||
|             FileUtil::CreateEmptyFile(full_path); |             FileUtil::CreateEmptyFile(full_path); | ||||||
|         } |         } | ||||||
|         break; |         break; | ||||||
|  |     case PathParser::FileFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     FileUtil::IOFile file(full_path, mode.write_flag ? "r+b" : "rb"); |     FileUtil::IOFile file(full_path, mode.write_flag ? "r+b" : "rb"); | ||||||
|  | @ -91,6 +93,8 @@ ResultCode SaveDataArchive::DeleteFile(const Path& path) const { | ||||||
|     case PathParser::NotFound: |     case PathParser::NotFound: | ||||||
|         LOG_ERROR(Service_FS, "File not found %s", full_path.c_str()); |         LOG_ERROR(Service_FS, "File not found %s", full_path.c_str()); | ||||||
|         return ERROR_FILE_NOT_FOUND; |         return ERROR_FILE_NOT_FOUND; | ||||||
|  |     case PathParser::FileFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (FileUtil::Delete(full_path)) { |     if (FileUtil::Delete(full_path)) { | ||||||
|  | @ -139,6 +143,8 @@ static ResultCode DeleteDirectoryHelper(const Path& path, const std::string& mou | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "Unexpected file or directory %s", full_path.c_str()); |         LOG_ERROR(Service_FS, "Unexpected file or directory %s", full_path.c_str()); | ||||||
|         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY; |         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY; | ||||||
|  |     case PathParser::DirectoryFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (deleter(full_path)) { |     if (deleter(full_path)) { | ||||||
|  | @ -182,6 +188,8 @@ ResultCode SaveDataArchive::CreateFile(const FileSys::Path& path, u64 size) cons | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); |         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); | ||||||
|         return ERROR_FILE_ALREADY_EXISTS; |         return ERROR_FILE_ALREADY_EXISTS; | ||||||
|  |     case PathParser::NotFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (size == 0) { |     if (size == 0) { | ||||||
|  | @ -225,6 +233,8 @@ ResultCode SaveDataArchive::CreateDirectory(const Path& path) const { | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); |         LOG_ERROR(Service_FS, "%s already exists", full_path.c_str()); | ||||||
|         return ERROR_DIRECTORY_ALREADY_EXISTS; |         return ERROR_DIRECTORY_ALREADY_EXISTS; | ||||||
|  |     case PathParser::NotFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     if (FileUtil::CreateDir(mount_point + path.AsString())) { |     if (FileUtil::CreateDir(mount_point + path.AsString())) { | ||||||
|  | @ -269,6 +279,8 @@ ResultVal<std::unique_ptr<DirectoryBackend>> SaveDataArchive::OpenDirectory( | ||||||
|     case PathParser::FileFound: |     case PathParser::FileFound: | ||||||
|         LOG_ERROR(Service_FS, "Unexpected file in path %s", full_path.c_str()); |         LOG_ERROR(Service_FS, "Unexpected file in path %s", full_path.c_str()); | ||||||
|         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY; |         return ERROR_UNEXPECTED_FILE_OR_DIRECTORY; | ||||||
|  |     case PathParser::DirectoryFound: | ||||||
|  |         break; // Expected 'success' case
 | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     auto directory = std::make_unique<DiskDirectory>(full_path); |     auto directory = std::make_unique<DiskDirectory>(full_path); | ||||||
|  |  | ||||||
|  | @ -227,6 +227,8 @@ static void ThrowFatalError(Interface* self) { | ||||||
|             LOG_CRITICAL(Service_ERR, "FINST2: 0x%08X", |             LOG_CRITICAL(Service_ERR, "FINST2: 0x%08X", | ||||||
|                          errtype.exception_data.exception_info.fpinst2); |                          errtype.exception_data.exception_info.fpinst2); | ||||||
|             break; |             break; | ||||||
|  |         case ExceptionType::Undefined: | ||||||
|  |             break; // Not logging exception_info for this case
 | ||||||
|         } |         } | ||||||
|         LOG_CRITICAL(Service_ERR, "Datetime: %s", GetCurrentSystemTime().c_str()); |         LOG_CRITICAL(Service_ERR, "Datetime: %s", GetCurrentSystemTime().c_str()); | ||||||
|         break; |         break; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue