citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4021 from FearlessTobi/port-709 

Port #709 from yuzu: "common/misc: Deduplicate code in GetLastErrorMsg()
This commit is contained in:
James Rowe 2018-08-02 11:00:53 -06:00 committed by GitHub
parent 4250dedc8f b0c35c54ca
commit c771dd9813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/common_funcs.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <string>
#if !defined(ARCHITECTURE_x86_64) #if !defined(ARCHITECTURE_x86_64)
#include <cstdlib> // for exit #include <cstdlib> // for exit
#endif #endif
@ -57,4 +59,4 @@ __declspec(dllimport) void __stdcall DebugBreak(void);
// Call directly after the command or use the error num. // Call directly after the command or use the error num.
// This function might change the error code. // This function might change the error code.
// Defined in Misc.cpp. // Defined in Misc.cpp.
const char* GetLastErrorMsg(); std::string GetLastErrorMsg();

14
src/common/misc.cpp
View File

@ -10,28 +10,22 @@
#include <cstring> #include <cstring>
#endif #endif
// Neither Android nor OS X support TLS #include "common/common_funcs.h"
#if defined(__APPLE__) || (ANDROID && __clang__)
#define __thread
#endif
// Generic function to get last error message. // Generic function to get last error message.
// Call directly after the command or use the error num. // Call directly after the command or use the error num.
// This function might change the error code. // This function might change the error code.
const char* GetLastErrorMsg() { std::string GetLastErrorMsg() {
static const size_t buff_size = 255; static const size_t buff_size = 255;
char err_str[buff_size];
#ifdef _WIN32 #ifdef _WIN32
static __declspec(thread) char err_str[buff_size] = {};
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(), FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), err_str, buff_size, nullptr); MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), err_str, buff_size, nullptr);
#else #else
static __thread char err_str[buff_size] = {};
// Thread safe (XSI-compliant) // Thread safe (XSI-compliant)
strerror_r(errno, err_str, buff_size); strerror_r(errno, err_str, buff_size);
#endif #endif
return err_str; return std::string(err_str, buff_size);
} }