forked from eden-emu/eden
		
	common/misc: Deduplicate code in GetLastErrorMsg()
Android and macOS have supported thread_local for quite a while, but most importantly is that we don't even really need it. Instead of using a thread-local buffer, we can just return a non-static buffer as a std::string, avoiding the need for that quality entirely.
This commit is contained in:
		
							parent
							
								
									49881ebe2c
								
							
						
					
					
						commit
						03d8c78199
					
				
					 2 changed files with 8 additions and 12 deletions
				
			
		|  | @ -4,6 +4,8 @@ | ||||||
| 
 | 
 | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
|  | #include <string> | ||||||
|  | 
 | ||||||
| #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) | #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) | ||||||
| #include <cstdlib> // for exit | #include <cstdlib> // for exit | ||||||
| #endif | #endif | ||||||
|  | @ -90,7 +92,7 @@ __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(); | ||||||
| 
 | 
 | ||||||
| namespace Common { | namespace Common { | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -4,34 +4,28 @@ | ||||||
| 
 | 
 | ||||||
| #include <cstddef> | #include <cstddef> | ||||||
| #ifdef _WIN32 | #ifdef _WIN32 | ||||||
| #include <windows.h> | #include <Windows.h> | ||||||
| #else | #else | ||||||
| #include <cerrno> | #include <cerrno> | ||||||
| #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); | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Lioncash
						Lioncash