From 4fed5e7b88d78c03359009377b740a3c826505a7 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 14 Jun 2026 06:08:11 +0200 Subject: [PATCH] Fix iso integrity log message --- rpcs3/Loader/content_validation.cpp | 2 +- rpcs3/Loader/content_validation.h | 2 +- rpcs3/Loader/iso_cache.cpp | 4 ++-- rpcs3/Loader/iso_cache.h | 4 ++-- rpcs3/rpcs3qt/content_integrity.cpp | 2 +- rpcs3/rpcs3qt/game_list_actions.cpp | 2 +- rpcs3/rpcs3qt/game_list_actions.h | 2 +- rpcs3/util/logs.hpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rpcs3/Loader/content_validation.cpp b/rpcs3/Loader/content_validation.cpp index 818bab63ad..773ee276be 100644 --- a/rpcs3/Loader/content_validation.cpp +++ b/rpcs3/Loader/content_validation.cpp @@ -11,7 +11,7 @@ LOG_CHANNEL(sys_log, "VALIDATION"); -content_integrity_status content_validation::check_integrity(content_file_type file_type, const std::string& hash, std::string* game_name) +content_integrity_status content_validation::check_integrity(content_file_type file_type, std::string_view hash, std::string* game_name) { // // Check for Redump db diff --git a/rpcs3/Loader/content_validation.h b/rpcs3/Loader/content_validation.h index 4540ae6b3e..dc5d4ac5d9 100644 --- a/rpcs3/Loader/content_validation.h +++ b/rpcs3/Loader/content_validation.h @@ -40,7 +40,7 @@ private: content_hash_status m_status = content_hash_status::INITIALIZED; public: - static content_integrity_status check_integrity(content_file_type file_type, const std::string& hash, std::string* game_name = nullptr); + static content_integrity_status check_integrity(content_file_type file_type, std::string_view hash, std::string* game_name = nullptr); const std::string& get_path() const { return m_path; } const std::string& get_name() const { return m_name; } diff --git a/rpcs3/Loader/iso_cache.cpp b/rpcs3/Loader/iso_cache.cpp index a37927cf39..8360ebde7f 100644 --- a/rpcs3/Loader/iso_cache.cpp +++ b/rpcs3/Loader/iso_cache.cpp @@ -40,7 +40,7 @@ namespace namespace iso_cache { - bool load(const std::string& iso_path, const std::string& cache_key, iso_metadata_cache_entry& out_entry) + bool load(const std::string& iso_path, std::string_view cache_key, iso_metadata_cache_entry& out_entry) { fs::stat_t iso_stat{}; if (!fs::get_stat(iso_path, iso_stat) || iso_stat.is_directory) @@ -95,7 +95,7 @@ namespace iso_cache return true; } - void save(const std::string& iso_path, const std::string& cache_key, const iso_metadata_cache_entry& entry) + void save(std::string_view iso_path, std::string_view cache_key, const iso_metadata_cache_entry& entry) { const std::string stem = get_cache_stem(cache_key); const std::string dir = get_cache_dir(); diff --git a/rpcs3/Loader/iso_cache.h b/rpcs3/Loader/iso_cache.h index 88b080b1df..04f4c3a402 100644 --- a/rpcs3/Loader/iso_cache.h +++ b/rpcs3/Loader/iso_cache.h @@ -23,10 +23,10 @@ struct iso_metadata_cache_entry namespace iso_cache { // Returns false if no valid cache entry exists or mtime has changed. - bool load(const std::string& iso_path, const std::string& cache_key, iso_metadata_cache_entry& out_entry); + bool load(const std::string& iso_path, std::string_view cache_key, iso_metadata_cache_entry& out_entry); // Persists a populated cache entry to disk. - void save(const std::string& iso_path, const std::string& cache_key, const iso_metadata_cache_entry& entry); + void save(std::string_view iso_path, std::string_view cache_key, const iso_metadata_cache_entry& entry); bool load_index(const std::string& iso_path, std::vector& out_subdirs); void save_index(const std::string& iso_path, const std::vector& subdirs); diff --git a/rpcs3/rpcs3qt/content_integrity.cpp b/rpcs3/rpcs3qt/content_integrity.cpp index 16b68f316f..97aabc88c9 100644 --- a/rpcs3/rpcs3qt/content_integrity.cpp +++ b/rpcs3/rpcs3qt/content_integrity.cpp @@ -83,7 +83,7 @@ void content_integrity::handle_download_canceled() void content_integrity::handle_download_error(const QString& error) { - sys_log.error("", error.toStdString().c_str()); + sys_log.error("Database download failed: %s", error); } QByteArray content_integrity::read_json(const QByteArray& data, bool after_download) diff --git a/rpcs3/rpcs3qt/game_list_actions.cpp b/rpcs3/rpcs3qt/game_list_actions.cpp index a8db41f42c..97cb37e7ce 100644 --- a/rpcs3/rpcs3qt/game_list_actions.cpp +++ b/rpcs3/rpcs3qt/game_list_actions.cpp @@ -605,7 +605,7 @@ void game_list_actions::ShowDiskUsageDialog() }); } -bool game_list_actions::IsGameRunning(const std::string& serial) +bool game_list_actions::IsGameRunning(std::string_view serial) { return !Emu.IsStopped(true) && (serial == Emu.GetTitleID() || (serial == "vsh.self" && Emu.IsVsh())); } diff --git a/rpcs3/rpcs3qt/game_list_actions.h b/rpcs3/rpcs3qt/game_list_actions.h index bc54352836..ff0b4a0be7 100644 --- a/rpcs3/rpcs3qt/game_list_actions.h +++ b/rpcs3/rpcs3qt/game_list_actions.h @@ -49,7 +49,7 @@ public: std::set removed_disc_list; // Filled in by RemoveContentList() }; - static bool IsGameRunning(const std::string& serial); + static bool IsGameRunning(std::string_view serial); void CreateShortcuts(const std::vector& games, const std::set& locations); diff --git a/rpcs3/util/logs.hpp b/rpcs3/util/logs.hpp index a2fcc863b2..459e35f167 100644 --- a/rpcs3/util/logs.hpp +++ b/rpcs3/util/logs.hpp @@ -175,10 +175,10 @@ namespace logs void silence(); // Log level control: register channel if necessary, set channel level - void set_level(const std::string&, level); + void set_level(const std::string& ch_name, level value); // Log level control: get channel level - level get_level(const std::string&); + level get_level(const std::string& ch_name); // Log level control: set specific channels to level::fatal void set_channel_levels(const std::map>& map);