mirror of
https://github.com/azerothcore/azerothcore-wotlk.git
synced 2026-01-10 11:11:14 -08:00
refactor(Core/Misc): Acore::StringFormat to fmt format (#19838)
refactor(Core/Utilities): Acore::StringFormat to fmt format * closes https://github.com/azerothcore/azerothcore-wotlk/issues/10356
This commit is contained in:
parent
f6fd978a7a
commit
de2bcbdabf
36 changed files with 100 additions and 115 deletions
|
|
@ -62,19 +62,19 @@ namespace
|
|||
inline std::string MakeMessage(std::string_view messageType, std::string_view file, uint32 line, std::string_view function,
|
||||
std::string_view message, std::string_view fmtMessage = {}, std::string_view debugInfo = {})
|
||||
{
|
||||
std::string msg = Acore::StringFormatFmt("\n>> {}\n\n# Location: {}:{}\n# Function: {}\n# Condition: {}\n", messageType, file, line, function, message);
|
||||
std::string msg = Acore::StringFormat("\n>> {}\n\n# Location: {}:{}\n# Function: {}\n# Condition: {}\n", messageType, file, line, function, message);
|
||||
|
||||
if (!fmtMessage.empty())
|
||||
{
|
||||
msg.append(Acore::StringFormatFmt("# Message: {}\n", fmtMessage));
|
||||
msg.append(Acore::StringFormat("# Message: {}\n", fmtMessage));
|
||||
}
|
||||
|
||||
if (!debugInfo.empty())
|
||||
{
|
||||
msg.append(Acore::StringFormatFmt("\n# Debug info: {}\n", debugInfo));
|
||||
msg.append(Acore::StringFormat("\n# Debug info: {}\n", debugInfo));
|
||||
}
|
||||
|
||||
return Acore::StringFormatFmt(
|
||||
return Acore::StringFormat(
|
||||
"#{0:-^{2}}#\n"
|
||||
" {1: ^{2}} \n"
|
||||
"#{0:-^{2}}#\n", "", msg, 70);
|
||||
|
|
@ -90,14 +90,14 @@ namespace
|
|||
*/
|
||||
inline std::string MakeAbortMessage(std::string_view file, uint32 line, std::string_view function, std::string_view fmtMessage = {})
|
||||
{
|
||||
std::string msg = Acore::StringFormatFmt("\n>> ABORTED\n\n# Location '{}:{}'\n# Function '{}'\n", file, line, function);
|
||||
std::string msg = Acore::StringFormat("\n>> ABORTED\n\n# Location '{}:{}'\n# Function '{}'\n", file, line, function);
|
||||
|
||||
if (!fmtMessage.empty())
|
||||
{
|
||||
msg.append(Acore::StringFormatFmt("# Message '{}'\n", fmtMessage));
|
||||
msg.append(Acore::StringFormat("# Message '{}'\n", fmtMessage));
|
||||
}
|
||||
|
||||
return Acore::StringFormatFmt(
|
||||
return Acore::StringFormat(
|
||||
"\n#{0:-^{2}}#\n"
|
||||
" {1: ^{2}} \n"
|
||||
"#{0:-^{2}}#\n", "", msg, 70);
|
||||
|
|
@ -148,7 +148,7 @@ void Acore::Abort(std::string_view file, uint32 line, std::string_view function,
|
|||
void Acore::AbortHandler(int sigval)
|
||||
{
|
||||
// nothing useful to log here, no way to pass args
|
||||
std::string formattedMessage = StringFormatFmt("Caught signal {}\n", sigval);
|
||||
std::string formattedMessage = StringFormat("Caught signal {}\n", sigval);
|
||||
fmt::print(stderr, "{}", formattedMessage);
|
||||
fflush(stderr);
|
||||
Crash(formattedMessage.c_str());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue