From 52f2fadb369a69081e50bac6289394a1be417b6f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 9 Nov 2020 02:35:49 -0500 Subject: [PATCH] UICommon: Migrate logging over to fmt A very simple change that continues the migration of the logs over to fmt. --- Source/Core/UICommon/AutoUpdate.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp index 4b457c6aa4..a4a7bffec3 100644 --- a/Source/Core/UICommon/AutoUpdate.cpp +++ b/Source/Core/UICommon/AutoUpdate.cpp @@ -164,24 +164,24 @@ void AutoUpdateChecker::CheckForUpdate() auto resp = req.Get(url); if (!resp) { - ERROR_LOG(COMMON, "Auto-update request failed"); + ERROR_LOG_FMT(COMMON, "Auto-update request failed"); return; } - std::string contents(reinterpret_cast(resp->data()), resp->size()); - INFO_LOG(COMMON, "Auto-update JSON response: %s", contents.c_str()); + const std::string contents(reinterpret_cast(resp->data()), resp->size()); + INFO_LOG_FMT(COMMON, "Auto-update JSON response: {}", contents); picojson::value json; - std::string err = picojson::parse(json, contents); + const std::string err = picojson::parse(json, contents); if (!err.empty()) { - ERROR_LOG(COMMON, "Invalid JSON received from auto-update service: %s", err.c_str()); + ERROR_LOG_FMT(COMMON, "Invalid JSON received from auto-update service: {}", err); return; } picojson::object obj = json.get(); if (obj["status"].get() != "outdated") { - INFO_LOG(COMMON, "Auto-update status: we are up to date."); + INFO_LOG_FMT(COMMON, "Auto-update status: we are up to date."); return; } @@ -229,9 +229,8 @@ void AutoUpdateChecker::TriggerUpdate(const AutoUpdateChecker::NewVersionInforma #endif // Run the updater! - std::string command_line = MakeUpdaterCommandLine(updater_flags); - - INFO_LOG(COMMON, "Updater command line: %s", command_line.c_str()); + const std::string command_line = MakeUpdaterCommandLine(updater_flags); + INFO_LOG_FMT(COMMON, "Updater command line: {}", command_line); #ifdef _WIN32 STARTUPINFO sinfo = {sizeof(sinfo)}; @@ -245,12 +244,12 @@ void AutoUpdateChecker::TriggerUpdate(const AutoUpdateChecker::NewVersionInforma } else { - ERROR_LOG(COMMON, "Could not start updater process: error=%d", GetLastError()); + ERROR_LOG_FMT(COMMON, "Could not start updater process: error={}", GetLastError()); } #else if (popen(command_line.c_str(), "r") == nullptr) { - ERROR_LOG(COMMON, "Could not start updater process: error=%d", errno); + ERROR_LOG_FMT(COMMON, "Could not start updater process: error={}", errno); } #endif