From 377aa3f7ce1559dc72c681672aca03facce5dc56 Mon Sep 17 00:00:00 2001
From: altalk23 <student@altalk23.local>
Date: Wed, 12 Oct 2022 21:31:33 +0300
Subject: [PATCH] fix unformmated log::log functions
---
loader/src/hooks/save.cpp | 2 +-
loader/src/internal/InternalMod.cpp | 2 +-
loader/src/load/Hook.cpp | 2 +-
loader/src/load/Mod.cpp | 7 ++++---
loader/src/load/cgeode.cpp | 2 +-
loader/src/load/load.cpp | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/loader/src/hooks/save.cpp b/loader/src/hooks/save.cpp
index c581043e..b77714a6 100644
--- a/loader/src/hooks/save.cpp
+++ b/loader/src/hooks/save.cpp
@@ -9,7 +9,7 @@ class $modify(AppDelegate) {
auto r = Loader::get()->saveSettings();
if (!r) {
- log::log(Severity::Error, Loader::getInternalMod(), r.error());
+ log::log(Severity::Error, Loader::getInternalMod(), "{}", r.error());
}
log::log(Severity::Info, Loader::getInternalMod(), "Saved");
diff --git a/loader/src/internal/InternalMod.cpp b/loader/src/internal/InternalMod.cpp
index 9c100537..1028db12 100644
--- a/loader/src/internal/InternalMod.cpp
+++ b/loader/src/internal/InternalMod.cpp
@@ -42,7 +42,7 @@ InternalMod::InternalMod() : Mod(getInternalModInfo()) {
auto sett = this->loadSettings();
if (!sett) {
- log::log(Severity::Error, this, sett.error());
+ log::log(Severity::Error, this, "{}", sett.error());
}
}
diff --git a/loader/src/load/Hook.cpp b/loader/src/load/Hook.cpp
index f103623a..70b9c248 100644
--- a/loader/src/load/Hook.cpp
+++ b/loader/src/load/Hook.cpp
@@ -86,7 +86,7 @@ bool InternalLoader::loadHooks() {
for (auto const& hook : internalHooks()) {
auto res = hook.mod->addHook(hook.hook);
if (!res) {
- log::log(Severity::Error, hook.mod, res.error());
+ log::log(Severity::Error, hook.mod, "{}", res.error());
thereWereErrors = true;
}
}
diff --git a/loader/src/load/Mod.cpp b/loader/src/load/Mod.cpp
index 3bc343b7..0d2504c0 100644
--- a/loader/src/load/Mod.cpp
+++ b/loader/src/load/Mod.cpp
@@ -78,7 +78,8 @@ Result<> Mod::loadSettings() {
log::log(
Severity::Warning,
this,
- "Encountered unknown setting \"" + key + "\" while loading settings"
+ "Encountered unknown setting \"{}\" while loading settings",
+ key
);
}
}
@@ -382,13 +383,13 @@ bool Mod::updateDependencyStates() {
auto r = dep.m_mod->load();
if (!r) {
dep.m_state = ModResolveState::Unloaded;
- log::log(Severity::Error, dep.m_mod, r.error());
+ log::log(Severity::Error, dep.m_mod, "{}", r.error());
}
else {
auto r = dep.m_mod->enable();
if (!r) {
dep.m_state = ModResolveState::Disabled;
- log::log(Severity::Error, dep.m_mod, r.error());
+ log::log(Severity::Error, dep.m_mod, "{}", r.error());
}
}
} else {
diff --git a/loader/src/load/cgeode.cpp b/loader/src/load/cgeode.cpp
index 4ad02e89..874e40b7 100644
--- a/loader/src/load/cgeode.cpp
+++ b/loader/src/load/cgeode.cpp
@@ -8,7 +8,7 @@ std::string g_lastError = "";
void geode_mod_log(void* cmod, const char* message) {
auto mod = reinterpret_cast<Mod*>(cmod);
- log::log(Severity::Debug, mod, message);
+ log::log(Severity::Debug, mod, "{}", message);
}
bool geode_mod_add_hook(void* cmod, void* address, void* detour) {
diff --git a/loader/src/load/load.cpp b/loader/src/load/load.cpp
index 6fb8bb06..112f8baa 100644
--- a/loader/src/load/load.cpp
+++ b/loader/src/load/load.cpp
@@ -41,7 +41,7 @@ Result<Mod*> Loader::loadModFromFile(std::string const& path) {
auto sett = mod->loadSettings();
if (!sett) {
- log::log(Severity::Error, mod, sett.error());
+ log::log(Severity::Error, mod, "{}", sett.error());
}
// enable mod if needed