From 3284bef3606953898532410c44cefb5db0c40caa Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 29 Apr 2018 18:37:15 -0400 Subject: [PATCH] string_util: Remove StringFromFormat() and related functions Given we utilize fmt, we don't need to provide our own functions for formatting anymore --- src/citra/emu_window/emu_window_sdl2.cpp | 5 +- src/citra_qt/bootmanager.cpp | 6 +- src/citra_qt/game_list.cpp | 1 + src/citra_qt/main.cpp | 1 + src/common/memory_util.cpp | 4 +- src/common/string_util.cpp | 70 ------------------- src/common/string_util.h | 14 ---- src/common/timer.cpp | 10 +-- src/core/file_sys/archive_extsavedata.cpp | 10 +-- .../file_sys/archive_source_sd_savedata.cpp | 10 ++- src/core/file_sys/archive_systemsavedata.cpp | 5 +- src/core/gdbstub/gdbstub.cpp | 14 ++-- src/core/hle/kernel/svc.cpp | 17 +++-- src/core/hle/service/am/am.cpp | 16 ++--- src/core/hle/service/service.cpp | 5 +- src/core/loader/ncch.cpp | 3 +- 16 files changed, 56 insertions(+), 135 deletions(-) diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index be358f7a2..247554c98 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -7,6 +7,7 @@ #include #define SDL_MAIN_HANDLED #include +#include #include #include "citra/emu_window/emu_window_sdl2.h" #include "common/logging/log.h" @@ -100,8 +101,8 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) { SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0); - std::string window_title = Common::StringFromFormat( - "Citra %s| %s-%s ", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); + std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_fullname, + Common::g_scm_branch, Common::g_scm_desc); render_window = SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, // x position diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index dc345ad57..fa04f535e 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -4,6 +4,8 @@ #include #include +#include + #include "citra_qt/bootmanager.h" #include "common/microprofile.h" #include "common/scm_rev.h" @@ -103,8 +105,8 @@ private: GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : QWidget(parent), child(nullptr), emu_thread(emu_thread) { - std::string window_title = Common::StringFromFormat("Citra %s| %s-%s", Common::g_build_name, - Common::g_scm_branch, Common::g_scm_desc); + std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_name, + Common::g_scm_branch, Common::g_scm_desc); setWindowTitle(QString::fromStdString(window_title)); InputCommon::Init(); diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index e26c1032e..1aecb4fc4 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "citra_qt/game_list.h" #include "citra_qt/game_list_p.h" #include "citra_qt/main.h" diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index e95cf3c2d..4cb59c915 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include "citra_qt/aboutdialog.h" #include "citra_qt/applets/swkbd.h" #include "citra_qt/bootmanager.h" diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 835d9478b..f73cea3e7 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "common/logging/log.h" #include "common/memory_util.h" @@ -167,8 +168,7 @@ std::string MemUsage() { return "MemUsage Error"; if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) - Ret = Common::StringFromFormat( - "%s K", Common::ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); + Ret = fmt::format("{} K", Common::ThousandSeparate(pmc.WorkingSetSize / 1024, 7)); CloseHandle(hProcess); return Ret; diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 27f37b86d..83475126f 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -36,76 +36,6 @@ std::string ToUpper(std::string str) { return str; } -bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args) { - int writtenCount; - -#ifdef _MSC_VER - // You would think *printf are simple, right? Iterate on each character, - // if it's a format specifier handle it properly, etc. - // - // Nooooo. Not according to the C standard. - // - // According to the C99 standard (7.19.6.1 "The fprintf function") - // The format shall be a multibyte character sequence - // - // Because some character encodings might have '%' signs in the middle of - // a multibyte sequence (SJIS for example only specifies that the first - // byte of a 2 byte sequence is "high", the second byte can be anything), - // printf functions have to decode the multibyte sequences and try their - // best to not screw up. - // - // Unfortunately, on Windows, the locale for most languages is not UTF-8 - // as we would need. Notably, for zh_TW, Windows chooses EUC-CN as the - // locale, and completely fails when trying to decode UTF-8 as EUC-CN. - // - // On the other hand, the fix is simple: because we use UTF-8, no such - // multibyte handling is required as we can simply assume that no '%' char - // will be present in the middle of a multibyte sequence. - // - // This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l. - static locale_t c_locale = nullptr; - if (!c_locale) - c_locale = _create_locale(LC_ALL, ".1252"); - writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args); -#else - writtenCount = vsnprintf(out, outsize, format, args); -#endif - - if (writtenCount > 0 && writtenCount < outsize) { - out[writtenCount] = '\0'; - return true; - } else { - out[outsize - 1] = '\0'; - return false; - } -} - -std::string StringFromFormat(const char* format, ...) { - va_list args; - char* buf = nullptr; -#ifdef _WIN32 - int required = 0; - - va_start(args, format); - required = _vscprintf(format, args); - buf = new char[required + 1]; - CharArrayFromFormatV(buf, required + 1, format, args); - va_end(args); - - std::string temp = buf; - delete[] buf; -#else - va_start(args, format); - if (vasprintf(&buf, format, args) < 0) - LOG_ERROR(Common, "Unable to allocate memory for string"); - va_end(args); - - std::string temp = buf; - free(buf); -#endif - return temp; -} - // For Debugging. Read out an u8 array. std::string ArrayToString(const u8* data, size_t size, int line_len, bool spaces) { std::ostringstream oss; diff --git a/src/common/string_util.h b/src/common/string_util.h index 4f22d8c6c..3a6c9d159 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include #include @@ -20,19 +19,6 @@ std::string ToLower(std::string str); /// Make a string uppercase std::string ToUpper(std::string str); -std::string StringFromFormat(const char* format, ...); -// Cheap! -bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args); - -template -inline void CharArrayFromFormat(char (&out)[Count], const char* format, ...) { - va_list args; - va_start(args, format); - CharArrayFromFormatV(out, Count, format, args); - va_end(args); -} - -// Good std::string ArrayToString(const u8* data, size_t size, int line_len = 20, bool spaces = true); std::string StripSpaces(const std::string& s); diff --git a/src/common/timer.cpp b/src/common/timer.cpp index 874170b5b..e2cf704cf 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -3,6 +3,9 @@ // Refer to the license.txt file included. #include + +#include + #include "common/common_types.h" #include "common/string_util.h" #include "common/timer.h" @@ -91,9 +94,8 @@ std::string Timer::GetTimeElapsedFormatted() const { // Hours std::chrono::hours Hours = std::chrono::duration_cast(Milliseconds); - std::string TmpStr = - StringFromFormat("%02d:%02d:%02d:%03d", Hours.count(), Minutes.count() % 60, - Seconds.count() % 60, Milliseconds.count() % 1000); + std::string TmpStr = fmt::format("{:02}:{:02}:{:02}:{:03}", Hours.count(), Minutes.count() % 60, + Seconds.count() % 60, Milliseconds.count() % 1000); return TmpStr; } @@ -135,7 +137,7 @@ std::string Timer::GetTimeFormatted() { strftime(tmp, 6, "%M:%S", gmTime); u64 milliseconds = static_cast(GetTimeMs().count()) % 1000; - return StringFromFormat("%s:%03d", tmp, milliseconds); + return fmt::format("{}:{:03}", tmp, milliseconds); } // Returns a timestamp with decimals for precise time comparisons diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 21374014d..830a363e2 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "common/common_types.h" #include "common/file_util.h" #include "common/logging/log.h" @@ -165,16 +166,15 @@ std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) ExtSaveDataArchivePath path_data; std::memcpy(&path_data, vec_data.data(), sizeof(path_data)); - return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), path_data.save_high, - path_data.save_low); + return fmt::format("{}{:08x}/{:08x}/", mount_point.c_str(), path_data.save_high, + path_data.save_low); } std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) { if (shared) - return Common::StringFromFormat("%sdata/%s/extdata/", mount_point.c_str(), SYSTEM_ID); + return fmt::format("{}data/{}/extdata/", mount_point.c_str(), SYSTEM_ID); - return Common::StringFromFormat("%sNintendo 3DS/%s/%s/extdata/", mount_point.c_str(), SYSTEM_ID, - SDCARD_ID); + return fmt::format("{}Nintendo 3DS/{}/{}/extdata/", mount_point.c_str(), SYSTEM_ID, SDCARD_ID); } Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low) { diff --git a/src/core/file_sys/archive_source_sd_savedata.cpp b/src/core/file_sys/archive_source_sd_savedata.cpp index e072d0650..b7fb549ff 100644 --- a/src/core/file_sys/archive_source_sd_savedata.cpp +++ b/src/core/file_sys/archive_source_sd_savedata.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "common/file_util.h" #include "common/logging/log.h" #include "common/string_util.h" @@ -18,22 +19,19 @@ namespace FileSys { namespace { std::string GetSaveDataContainerPath(const std::string& sdmc_directory) { - return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", sdmc_directory.c_str(), - SYSTEM_ID, SDCARD_ID); + return fmt::format("{}Nintendo 3DS/{}/{}/title/", sdmc_directory.c_str(), SYSTEM_ID, SDCARD_ID); } std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) { u32 high = static_cast(program_id >> 32); u32 low = static_cast(program_id & 0xFFFFFFFF); - return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, - low); + return fmt::format("{}{:08x}/{:08x}/data/00000001/", mount_location.c_str(), high, low); } std::string GetSaveDataMetadataPath(const std::string& mount_location, u64 program_id) { u32 high = static_cast(program_id >> 32); u32 low = static_cast(program_id & 0xFFFFFFFF); - return Common::StringFromFormat("%s%08x/%08x/data/00000001.metadata", mount_location.c_str(), - high, low); + return fmt::format("{}{:08x}/{:08x}/data/00000001.metadata", mount_location.c_str(), high, low); } } // namespace diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 463ff2a68..322e98fa4 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "common/common_types.h" #include "common/file_util.h" #include "common/string_util.h" @@ -25,11 +26,11 @@ std::string GetSystemSaveDataPath(const std::string& mount_point, const Path& pa u32 save_high; std::memcpy(&save_low, &vec_data[4], sizeof(u32)); std::memcpy(&save_high, &vec_data[0], sizeof(u32)); - return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_low, save_high); + return fmt::format("{}{:08X}/{:08X}/", mount_point.c_str(), save_low, save_high); } std::string GetSystemSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sdata/%s/sysdata/", mount_point.c_str(), SYSTEM_ID); + return fmt::format("{}data/{}/sysdata/", mount_point.c_str(), SYSTEM_ID); } Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low) { diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 557c65ed2..72e6e4f16 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef _WIN32 #include @@ -610,16 +611,17 @@ static void SendSignal(Kernel::Thread* thread, u32 signal, bool full = true) { std::string buffer; if (full) { - buffer = Common::StringFromFormat("T%02x%02x:%08x;%02x:%08x;%02x:%08x", latest_signal, - PC_REGISTER, htonl(Core::CPU().GetPC()), SP_REGISTER, - htonl(Core::CPU().GetReg(SP_REGISTER)), LR_REGISTER, - htonl(Core::CPU().GetReg(LR_REGISTER))); + + buffer = fmt::format("T{:02x}{:02x}:{:08x};{:02x}:{:08x};{:02x}:{:08x}", latest_signal, + PC_REGISTER, htonl(Core::CPU().GetPC()), SP_REGISTER, + htonl(Core::CPU().GetReg(SP_REGISTER)), LR_REGISTER, + htonl(Core::CPU().GetReg(LR_REGISTER))); } else { - buffer = Common::StringFromFormat("T%02x", latest_signal); + buffer = fmt::format("T{:02x}", latest_signal); } if (thread) { - buffer += Common::StringFromFormat(";thread:%x;", thread->GetThreadId()); + buffer += fmt::format(";thread:{:x};", thread->GetThreadId()); } LOG_DEBUG(Debug_GDBStub, "Response: {}", buffer); diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 1b127d9c5..3da279cea 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "common/logging/log.h" #include "common/microprofile.h" #include "common/scope_exit.h" @@ -723,7 +724,7 @@ static ResultCode GetResourceLimitLimitValues(VAddr values, Handle resource_limi /// Creates a new thread static ResultCode CreateThread(Handle* out_handle, u32 priority, u32 entry_point, u32 arg, u32 stack_top, s32 processor_id) { - std::string name = Common::StringFromFormat("unknown-%08" PRIX32, entry_point); + std::string name = fmt::format("unknown-{:08X}" PRIX32, entry_point); if (priority > THREADPRIO_LOWEST) { return ERR_OUT_OF_RANGE; @@ -825,7 +826,7 @@ static ResultCode SetThreadPriority(Handle handle, u32 priority) { /// Create a mutex static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { SharedPtr mutex = Mutex::Create(initial_locked != 0); - mutex->name = Common::StringFromFormat("mutex-%08x", Core::CPU().GetReg(14)); + mutex->name = fmt::format("mutex-{:08X}", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); LOG_TRACE(Kernel_SVC, "called initial_locked={} : created handle=0x{:08X}", @@ -888,7 +889,7 @@ static ResultCode GetThreadId(u32* thread_id, Handle handle) { /// Creates a semaphore static ResultCode CreateSemaphore(Handle* out_handle, s32 initial_count, s32 max_count) { CASCADE_RESULT(SharedPtr semaphore, Semaphore::Create(initial_count, max_count)); - semaphore->name = Common::StringFromFormat("semaphore-%08x", Core::CPU().GetReg(14)); + semaphore->name = fmt::format("semaphore-{:08X}", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(semaphore))); LOG_TRACE(Kernel_SVC, "called initial_count={}, max_count={}, created handle=0x{:08X}", @@ -938,9 +939,8 @@ static ResultCode QueryMemory(MemoryInfo* memory_info, PageInfo* page_info, u32 /// Create an event static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { - SharedPtr evt = - Event::Create(static_cast(reset_type), - Common::StringFromFormat("event-%08x", Core::CPU().GetReg(14))); + SharedPtr evt = Event::Create(static_cast(reset_type), + fmt::format("event-{:08X}", Core::CPU().GetReg(14))); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(evt))); LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, @@ -982,9 +982,8 @@ static ResultCode ClearEvent(Handle handle) { /// Creates a timer static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { - SharedPtr timer = - Timer::Create(static_cast(reset_type), - Common::StringFromFormat("timer-%08x", Core::CPU().GetReg(14))); + SharedPtr timer = Timer::Create(static_cast(reset_type), + fmt ::format("timer-{:08X}", Core::CPU().GetReg(14))); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(timer))); LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index d378da2d4..d6db9ae6a 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "common/file_util.h" #include "common/logging/log.h" #include "common/string_util.h" @@ -380,7 +381,7 @@ std::string GetTitleMetadataPath(Service::FS::MediaType media_type, u64 tid, boo if (base_id == update_id) update_id++; - return content_path + Common::StringFromFormat("%08x.tmd", (update ? update_id : base_id)); + return content_path + fmt::format("{:08x}.tmd", (update ? update_id : base_id)); } std::string GetTitleContentPath(Service::FS::MediaType media_type, u64 tid, u16 index, @@ -417,7 +418,7 @@ std::string GetTitleContentPath(Service::FS::MediaType media_type, u64 tid, u16 } } - return Common::StringFromFormat("%s%08x.app", content_path.c_str(), content_id); + return fmt::format("{}{:08x}.app", content_path.c_str(), content_id); } std::string GetTitlePath(Service::FS::MediaType media_type, u64 tid) { @@ -425,8 +426,7 @@ std::string GetTitlePath(Service::FS::MediaType media_type, u64 tid) { u32 low = static_cast(tid & 0xFFFFFFFF); if (media_type == Service::FS::MediaType::NAND || media_type == Service::FS::MediaType::SDMC) - return Common::StringFromFormat("%s%08x/%08x/", GetMediaTitlePath(media_type).c_str(), high, - low); + return fmt::format("{}{:08x}/{:08x}/", GetMediaTitlePath(media_type).c_str(), high, low); if (media_type == Service::FS::MediaType::GameCard) { // TODO(shinyquagsire23): get current app path if TID matches? @@ -439,13 +439,11 @@ std::string GetTitlePath(Service::FS::MediaType media_type, u64 tid) { std::string GetMediaTitlePath(Service::FS::MediaType media_type) { if (media_type == Service::FS::MediaType::NAND) - return Common::StringFromFormat("%s%s/title/", FileUtil::GetUserPath(D_NAND_IDX).c_str(), - SYSTEM_ID); + return fmt::format("{}{}/title/", FileUtil::GetUserPath(D_NAND_IDX).c_str(), SYSTEM_ID); if (media_type == Service::FS::MediaType::SDMC) - return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", - FileUtil::GetUserPath(D_SDMC_IDX).c_str(), SYSTEM_ID, - SDCARD_ID); + return fmt::format("{}Nintendo 3DS/{}/{}/title/", FileUtil::GetUserPath(D_SDMC_IDX).c_str(), + SYSTEM_ID, SDCARD_ID); if (media_type == Service::FS::MediaType::GameCard) { // TODO(shinyquagsire23): get current app parent folder if TID matches? diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 2c580e738..4f3478c7e 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -125,10 +125,9 @@ static std::string MakeFunctionString(const char* name, const char* port_name, // Number of params == bits 0-5 + bits 6-11 int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F); - std::string function_string = - Common::StringFromFormat("function '%s': port=%s", name, port_name); + std::string function_string = fmt::format("function '{}': port={}", name, port_name); for (int i = 1; i <= num_params; ++i) { - function_string += Common::StringFromFormat(", cmd_buff[%i]=0x%X", i, cmd_buff[i]); + function_string += fmt::format(", cmd_buff[{}]={:#X}", i, cmd_buff[i]); } return function_string; } diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index fdb147a64..2e4d956cf 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include "common/logging/log.h" #include "common/string_util.h" #include "common/swap.h" @@ -156,7 +157,7 @@ ResultStatus AppLoader_NCCH::Load(Kernel::SharedPtr& process) { return result; ReadProgramId(ncch_program_id); - std::string program_id{Common::StringFromFormat("%016" PRIX64, ncch_program_id)}; + std::string program_id{fmt::format("{:016X}", ncch_program_id)}; LOG_INFO(Loader, "Program ID: {}", program_id);