yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

common: fs: Remove [[nodiscard]] attribute on Remove* functions 

There are a lot of scenarios where we don't particularly care whether or not the removal operation and just simply attempt a removal.

As such, removing the [[nodiscard]] attribute is best for these functions.
This commit is contained in:
Morph 2021-06-19 03:43:16 -04:00
parent faf57c183f
commit 81b1b71993
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/fs/fs.h
View File

@ -55,11 +55,11 @@ template <typename Path>
* *
* @returns True if file removal succeeds or file does not exist, false otherwise. * @returns True if file removal succeeds or file does not exist, false otherwise.
*/ */
[[nodiscard]] bool RemoveFile(const std::filesystem::path& path); bool RemoveFile(const std::filesystem::path& path);
#ifdef _WIN32 #ifdef _WIN32
template <typename Path> template <typename Path>
[[nodiscard]] bool RemoveFile(const Path& path) { bool RemoveFile(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) { if constexpr (IsChar<typename Path::value_type>) {
return RemoveFile(ToU8String(path)); return RemoveFile(ToU8String(path));
} else { } else {
@ -251,11 +251,11 @@ template <typename Path>
* *
* @returns True if directory removal succeeds or directory does not exist, false otherwise. * @returns True if directory removal succeeds or directory does not exist, false otherwise.
*/ */
[[nodiscard]] bool RemoveDir(const std::filesystem::path& path); bool RemoveDir(const std::filesystem::path& path);
#ifdef _WIN32 #ifdef _WIN32
template <typename Path> template <typename Path>
[[nodiscard]] bool RemoveDir(const Path& path) { bool RemoveDir(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) { if constexpr (IsChar<typename Path::value_type>) {
return RemoveDir(ToU8String(path)); return RemoveDir(ToU8String(path));
} else { } else {
@ -276,11 +276,11 @@ template <typename Path>
* *
* @returns True if the directory and all of its contents are removed successfully, false otherwise. * @returns True if the directory and all of its contents are removed successfully, false otherwise.
*/ */
[[nodiscard]] bool RemoveDirRecursively(const std::filesystem::path& path); bool RemoveDirRecursively(const std::filesystem::path& path);
#ifdef _WIN32 #ifdef _WIN32
template <typename Path> template <typename Path>
[[nodiscard]] bool RemoveDirRecursively(const Path& path) { bool RemoveDirRecursively(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) { if constexpr (IsChar<typename Path::value_type>) {
return RemoveDirRecursively(ToU8String(path)); return RemoveDirRecursively(ToU8String(path));
} else { } else {
@ -301,11 +301,11 @@ template <typename Path>
* *
* @returns True if all of the directory's contents are removed successfully, false otherwise. * @returns True if all of the directory's contents are removed successfully, false otherwise.
*/ */
[[nodiscard]] bool RemoveDirContentsRecursively(const std::filesystem::path& path); bool RemoveDirContentsRecursively(const std::filesystem::path& path);
#ifdef _WIN32 #ifdef _WIN32
template <typename Path> template <typename Path>
[[nodiscard]] bool RemoveDirContentsRecursively(const Path& path) { bool RemoveDirContentsRecursively(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) { if constexpr (IsChar<typename Path::value_type>) {
return RemoveDirContentsRecursively(ToU8String(path)); return RemoveDirContentsRecursively(ToU8String(path));
} else { } else {

2
src/common/logging/backend.cpp
View File

@ -159,7 +159,7 @@ FileBackend::FileBackend(const std::filesystem::path& filename) {
// Existence checks are done within the functions themselves. // Existence checks are done within the functions themselves.
// We don't particularly care if these succeed or not. // We don't particularly care if these succeed or not.
void(FS::RemoveFile(old_filename)); FS::RemoveFile(old_filename);
void(FS::RenameFile(filename, old_filename)); void(FS::RenameFile(filename, old_filename));
file = file =

4
src/core/hle/service/bcat/backend/boxcat.cpp
View File

@ -313,7 +313,7 @@ void SynchronizeInternal(AM::Applets::AppletManager& applet_manager, DirectoryGe
LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res); LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res);
if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) { if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) {
void(Common::FS::RemoveFile(zip_path)); Common::FS::RemoveFile(zip_path);
} }
HandleDownloadDisplayResult(applet_manager, res); HandleDownloadDisplayResult(applet_manager, res);
@ -445,7 +445,7 @@ std::optional<std::vector<u8>> Boxcat::GetLaunchParameter(TitleIDVersion title)
LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res); LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res);
if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) { if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) {
void(Common::FS::RemoveFile(bin_file_path)); Common::FS::RemoveFile(bin_file_path);
} }
HandleDownloadDisplayResult(applet_manager, res); HandleDownloadDisplayResult(applet_manager, res);

2
src/video_core/vulkan_common/nsight_aftermath_tracker.cpp
View File

@ -50,7 +50,7 @@ NsightAftermathTracker::NsightAftermathTracker() {
} }
dump_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::LogDir) / "gpucrash"; dump_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::LogDir) / "gpucrash";
void(Common::FS::RemoveDirRecursively(dump_dir)); Common::FS::RemoveDirRecursively(dump_dir);
if (!Common::FS::CreateDir(dump_dir)) { if (!Common::FS::CreateDir(dump_dir)) {
LOG_ERROR(Render_Vulkan, "Failed to create Nsight Aftermath dump directory"); LOG_ERROR(Render_Vulkan, "Failed to create Nsight Aftermath dump directory");
return; return;

4
src/yuzu/configuration/configure_per_game_addons.cpp
View File

@ -79,8 +79,8 @@ void ConfigurePerGameAddons::ApplyConfiguration() {
std::sort(disabled_addons.begin(), disabled_addons.end()); std::sort(disabled_addons.begin(), disabled_addons.end());
std::sort(current.begin(), current.end()); std::sort(current.begin(), current.end());
if (disabled_addons != current) { if (disabled_addons != current) {
void(Common::FS::RemoveFile(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / Common::FS::RemoveFile(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) /
"game_list" / fmt::format("{:016X}.pv.txt", title_id))); "game_list" / fmt::format("{:016X}.pv.txt", title_id));
} }
Settings::values.disabled_addons[title_id] = disabled_addons; Settings::values.disabled_addons[title_id] = disabled_addons;

24
src/yuzu/main.cpp
View File

@ -194,10 +194,10 @@ static void RemoveCachedContents() {
const auto offline_legal_information = cache_dir / "offline_web_applet_legal_information"; const auto offline_legal_information = cache_dir / "offline_web_applet_legal_information";
const auto offline_system_data = cache_dir / "offline_web_applet_system_data"; const auto offline_system_data = cache_dir / "offline_web_applet_system_data";
void(Common::FS::RemoveDirRecursively(offline_fonts)); Common::FS::RemoveDirRecursively(offline_fonts);
void(Common::FS::RemoveDirRecursively(offline_manual)); Common::FS::RemoveDirRecursively(offline_manual);
void(Common::FS::RemoveDirRecursively(offline_legal_information)); Common::FS::RemoveDirRecursively(offline_legal_information);
void(Common::FS::RemoveDirRecursively(offline_system_data)); Common::FS::RemoveDirRecursively(offline_system_data);
} }
GMainWindow::GMainWindow() GMainWindow::GMainWindow()
@ -1743,8 +1743,8 @@ void GMainWindow::OnGameListRemoveInstalledEntry(u64 program_id, InstalledEntryT
RemoveAddOnContent(program_id, entry_type); RemoveAddOnContent(program_id, entry_type);
break; break;
} }
void(Common::FS::RemoveDirRecursively(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / Common::FS::RemoveDirRecursively(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) /
"game_list")); "game_list");
game_list->PopulateAsync(UISettings::values.game_dirs); game_list->PopulateAsync(UISettings::values.game_dirs);
} }
@ -2213,8 +2213,8 @@ void GMainWindow::OnMenuInstallToNAND() {
: tr("%n file(s) failed to install\n", "", failed_files.size())); : tr("%n file(s) failed to install\n", "", failed_files.size()));
QMessageBox::information(this, tr("Install Results"), install_results); QMessageBox::information(this, tr("Install Results"), install_results);
void(Common::FS::RemoveDirRecursively(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / Common::FS::RemoveDirRecursively(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) /
"game_list")); "game_list");
game_list->PopulateAsync(UISettings::values.game_dirs); game_list->PopulateAsync(UISettings::values.game_dirs);
ui.action_Install_File_NAND->setEnabled(true); ui.action_Install_File_NAND->setEnabled(true);
} }
@ -2846,7 +2846,7 @@ void GMainWindow::MigrateConfigFiles() {
LOG_INFO(Frontend, "Migrating config file from {} to {}", origin, destination); LOG_INFO(Frontend, "Migrating config file from {} to {}", origin, destination);
if (!Common::FS::RenameFile(origin, destination)) { if (!Common::FS::RenameFile(origin, destination)) {
// Delete the old config file if one already exists in the new location. // Delete the old config file if one already exists in the new location.
void(Common::FS::RemoveFile(origin)); Common::FS::RemoveFile(origin);
} }
} }
} }
@ -3040,9 +3040,9 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
const auto keys_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::KeysDir); const auto keys_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::KeysDir);
void(Common::FS::RemoveFile(keys_dir / "prod.keys_autogenerated")); Common::FS::RemoveFile(keys_dir / "prod.keys_autogenerated");
void(Common::FS::RemoveFile(keys_dir / "console.keys_autogenerated")); Common::FS::RemoveFile(keys_dir / "console.keys_autogenerated");
void(Common::FS::RemoveFile(keys_dir / "title.keys_autogenerated")); Common::FS::RemoveFile(keys_dir / "title.keys_autogenerated");
} }
Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance(); Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance();