Merge pull request #3143 from sepalani/fixWSAGetLastError

WSAGetLastError: fix return value
dolphin-emu · Oct 5, 2015 · 6aa230c · 6aa230c
2 parents 5d1f78d + 8efd5d1
commit 6aa230c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IPC_HLE/WII_Socket.cpp
@@ -81,7 +81,8 @@ static s32 TranslateErrorCode(s32 native_error, bool isRW)
 	}
 }
 
-s32 WiiSockMan::GetNetErrorCode(s32 ret, const std::string& caller, bool isRW)
+// Don't use string! (see https://github.com/dolphin-emu/dolphin/pull/3143)
+s32 WiiSockMan::GetNetErrorCode(s32 ret, const char* caller, bool isRW)
 {
 #ifdef _WIN32
 	s32 errorCode = WSAGetLastError();
@@ -96,7 +97,7 @@ s32 WiiSockMan::GetNetErrorCode(s32 ret, const std::string& caller, bool isRW)
 	}
 
 	INFO_LOG(WII_IPC_NET, "%s failed with error %d: %s, ret= %d",
-		caller.c_str(), errorCode, DecodeError(errorCode), ret);
+		caller, errorCode, DecodeError(errorCode), ret);
 
 	s32 ReturnValue = TranslateErrorCode(errorCode, isRW);
 	WiiSockMan::GetInstance().SetLastNetError(ReturnValue);

diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h
@@ -201,7 +201,7 @@ class WiiSocket
 class WiiSockMan : public ::NonCopyable
 {
 public:
-	static s32 GetNetErrorCode(s32 ret, const std::string& caller, bool isRW);
+	static s32 GetNetErrorCode(s32 ret, const char* caller, bool isRW);
 	static char* DecodeError(s32 ErrorCode);
 
 	static WiiSockMan& GetInstance()