From 33c08fc8aaf1ba5780a09d6ceaa2351abfd5e964 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 13 Dec 2022 13:34:44 +0000 Subject: Deduplicate retrieving error messages on Windows. --- src/modulemanager.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/modulemanager.cpp') diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index f44a7ca7b..aefccb0d5 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -134,12 +134,9 @@ void ModuleManager::LoadCoreModules(std::map& servicem if (!FileSystem::GetFileList(ServerInstance->Config->Paths.Module, files, "core_*.so")) { #ifdef _WIN32 - DWORD errcode = GetLastError(); - char errmsg[500]; - if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0) - sprintf_s(errmsg, _countof(errmsg), "Error code: %u", errcode); + const std::string errmsg = GetErrorMessage(GetLastError()); #else - char* errmsg = strerror(errno); + const char* errmsg = strerror(errno); #endif std::cout << "failed: " << errmsg << "!" << std::endl; ServerInstance->Exit(EXIT_STATUS_MODULE); -- cgit v1.3.1-10-gc9f91