From bab3ff0157065a62f6d16cba3953690a43529b05 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Wed, 10 Nov 2021 17:43:24 -0800 Subject: [PATCH] Common/MsgHandler: Remove non-format variants of PanicAlert They're no longer used. --- Languages/update-source-strings.sh | 6 ---- Source/Core/Common/Common.h | 2 +- Source/Core/Common/MsgHandler.cpp | 14 -------- Source/Core/Common/MsgHandler.h | 39 ----------------------- Source/Core/Core/ARDecrypt.cpp | 11 ++++--- Source/Core/Core/HW/SI/SI_Device.cpp | 2 +- Source/Core/Core/MemTools.cpp | 2 +- Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 5 +-- Source/Core/DolphinNoGUI/PlatformX11.cpp | 2 +- 9 files changed, 13 insertions(+), 70 deletions(-) diff --git a/Languages/update-source-strings.sh b/Languages/update-source-strings.sh index 6f7faf44a7..c3e1d61f63 100755 --- a/Languages/update-source-strings.sh +++ b/Languages/update-source-strings.sh @@ -10,16 +10,10 @@ SRCDIR=Source find $SRCDIR -name '*.cpp' -o -name '*.h' -o -name '*.c' | \ xgettext -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \ --keyword=_ \ - --keyword=wxTRANSLATE \ - --keyword=AskYesNoT \ --keyword=AskYesNoFmtT \ - --keyword=CriticalAlertT \ --keyword=CriticalAlertFmtT \ - --keyword=PanicAlertT \ --keyword=PanicAlertFmtT \ - --keyword=PanicYesNoT \ --keyword=PanicYesNoFmtT \ - --keyword=SuccessAlertT \ --keyword=SuccessAlertFmtT \ --keyword=GetStringT \ --keyword=_trans \ diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 1ed72b7280..61dd7d6351 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -15,7 +15,7 @@ #define CHECK_HEAP_INTEGRITY() \ { \ if (!_CrtCheckMemory()) \ - PanicAlert("memory corruption detected. see log."); \ + PanicAlertFmt("memory corruption detected. see log."); \ } // If you want to see how much a pain in the ass singletons are, for example: // {614} normal block at 0x030C5310, 188 bytes long. diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index d26264763c..c455beb3ed 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -127,20 +127,6 @@ static bool ShowMessageAlert(std::string_view text, bool yes_no, MsgType style) return true; } -// This is the first stop for gui alerts where the log is updated and the -// correct window is shown, but only for legacy printf-style messages -bool MsgAlert(bool yes_no, MsgType style, const char* format, ...) -{ - char buffer[2048]; - - va_list args; - va_start(args, format); - CharArrayFromFormatV(buffer, sizeof(buffer) - 1, s_str_translator(format).c_str(), args); - va_end(args); - - return ShowMessageAlert(buffer, yes_no, style); -} - // This is the first stop for gui alerts where the log is updated and the // correct window is shown, when using fmt bool MsgAlertFmtImpl(bool yes_no, MsgType style, fmt::string_view format, diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index 9b6f7f468f..435b8efe4e 100644 --- a/Source/Core/Common/MsgHandler.h +++ b/Source/Core/Common/MsgHandler.h @@ -30,12 +30,6 @@ void RegisterStringTranslator(StringTranslator translator); std::string GetStringT(const char* string); -bool MsgAlert(bool yes_no, MsgType style, const char* format, ...) -#ifdef __GNUC__ - __attribute__((format(printf, 3, 4))) -#endif - ; - bool MsgAlertFmtImpl(bool yes_no, MsgType style, fmt::string_view format, const fmt::format_args& args); @@ -59,39 +53,6 @@ std::string FmtFormatT(const char* string, Args&&... args) } } // namespace Common -// Deprecated variants of the alert macros. See the fmt variants down below. - -#define SuccessAlert(format, ...) \ - Common::MsgAlert(false, Common::MsgType::Information, format, ##__VA_ARGS__) - -#define PanicAlert(format, ...) \ - Common::MsgAlert(false, Common::MsgType::Warning, format, ##__VA_ARGS__) - -#define PanicYesNo(format, ...) \ - Common::MsgAlert(true, Common::MsgType::Warning, format, ##__VA_ARGS__) - -#define AskYesNo(format, ...) \ - Common::MsgAlert(true, Common::MsgType::Question, format, ##__VA_ARGS__) - -#define CriticalAlert(format, ...) \ - Common::MsgAlert(false, Common::MsgType::Critical, format, ##__VA_ARGS__) - -// Use these macros (that do the same thing) if the message should be translated. -#define SuccessAlertT(format, ...) \ - Common::MsgAlert(false, Common::MsgType::Information, format, ##__VA_ARGS__) - -#define PanicAlertT(format, ...) \ - Common::MsgAlert(false, Common::MsgType::Warning, format, ##__VA_ARGS__) - -#define PanicYesNoT(format, ...) \ - Common::MsgAlert(true, Common::MsgType::Warning, format, ##__VA_ARGS__) - -#define AskYesNoT(format, ...) \ - Common::MsgAlert(true, Common::MsgType::Question, format, ##__VA_ARGS__) - -#define CriticalAlertT(format, ...) \ - Common::MsgAlert(false, Common::MsgType::Critical, format, ##__VA_ARGS__) - // Fmt-capable variants of the macros #define GenericAlertFmt(yes_no, style, format, ...) \ diff --git a/Source/Core/Core/ARDecrypt.cpp b/Source/Core/Core/ARDecrypt.cpp index 042eea0f5b..1c6e4d3639 100644 --- a/Source/Core/Core/ARDecrypt.cpp +++ b/Source/Core/Core/ARDecrypt.cpp @@ -476,14 +476,15 @@ void DecryptARCode(std::vector vCodes, std::vector* ops) else if (!batchdecrypt(uCodes.data(), (u16)vCodes.size() << 1)) { // Commented out since we just send the code anyways and hope for the best XD - // PanicAlert("Action Replay Code Decryption Error:\nCRC Check Failed\n\n" - // "First Code in Block(should be verification code):\n%s", vCodes[0].c_str()); + // PanicAlertFmt("Action Replay Code Decryption Error:\nCRC Check Failed\n\n" + // "First Code in Block (should be verification code):\n{}", + // vCodes[0]); for (size_t i = 0; i < (vCodes.size() << 1); i += 2) { ops->emplace_back(uCodes[i], uCodes[i + 1]); - // PanicAlert("Decrypted AR Code without verification code:\n%08X %08X", uCodes[i], - // uCodes[i+1]); + // PanicAlertFmt("Decrypted AR Code without verification code:\n{:08X} {:08X}", uCodes[i], + // uCodes[i + 1]); } } else @@ -492,7 +493,7 @@ void DecryptARCode(std::vector vCodes, std::vector* ops) for (size_t i = 2; i < (vCodes.size() << 1); i += 2) { ops->emplace_back(uCodes[i], uCodes[i + 1]); - // PanicAlert("Decrypted AR Code:\n%08X %08X", uCodes[i], uCodes[i+1]); + // PanicAlertFmt("Decrypted AR Code:\n{:08X} {:08X}", uCodes[i], uCodes[i+1]); } } } diff --git a/Source/Core/Core/HW/SI/SI_Device.cpp b/Source/Core/Core/HW/SI/SI_Device.cpp index fa823ff8ad..93d6d93301 100644 --- a/Source/Core/Core/HW/SI/SI_Device.cpp +++ b/Source/Core/Core/HW/SI/SI_Device.cpp @@ -195,7 +195,7 @@ std::unique_ptr SIDevice_Create(const SIDevices device, const int por #ifdef HAS_LIBMGBA return std::make_unique(device, port_number); #else - PanicAlertT("Error: This build does not support emulated GBA controllers"); + PanicAlertFmtT("Error: This build does not support emulated GBA controllers"); return std::make_unique(device, port_number); #endif diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp index 96aea761bd..c427c8ba7e 100644 --- a/Source/Core/Core/MemTools.cpp +++ b/Source/Core/Core/MemTools.cpp @@ -328,7 +328,7 @@ void InstallExceptionHandler() signal_stack.ss_size = SIGSTKSZ; signal_stack.ss_flags = 0; if (sigaltstack(&signal_stack, nullptr)) - PanicAlert("sigaltstack failed"); + PanicAlertFmt("sigaltstack failed"); struct sigaction sa; sa.sa_handler = nullptr; sa.sa_sigaction = &sigsegv_handler; diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index c701f160c6..28c229d6c6 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -715,8 +715,9 @@ void JitArm64::Jit(u32 em_address, bool clear_cache_and_retry_on_failure) return; } - PanicAlertT("JIT failed to find code space after a cache clear. This should never happen. Please " - "report this incident on the bug tracker. Dolphin will now exit."); + PanicAlertFmtT( + "JIT failed to find code space after a cache clear. This should never happen. Please " + "report this incident on the bug tracker. Dolphin will now exit."); exit(-1); } diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp index 27d3ca120c..8dcd93bf52 100644 --- a/Source/Core/DolphinNoGUI/PlatformX11.cpp +++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp @@ -82,7 +82,7 @@ bool PlatformX11::Init() m_display = XOpenDisplay(nullptr); if (!m_display) { - PanicAlert("No X11 display found"); + PanicAlertFmt("No X11 display found"); return false; }