From a5361b75de3c89f2f1c948563ef7ac2c8d7a301c Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:29:14 +0100 Subject: [PATCH 1/2] refactor: Replace implicit conversion from NULL to AsciiString --- Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp b/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp index 6d7256070cd..edf47e89588 100644 --- a/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp +++ b/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp @@ -172,12 +172,12 @@ AsciiString IPEnumeration::getMachineName( void ) int err = WSAStartup(verReq, &wsadata); if (err != 0) { - return NULL; + return AsciiString(); } if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) { WSACleanup(); - return NULL; + return AsciiString(); } m_isWinsockInitialized = true; } @@ -187,7 +187,7 @@ AsciiString IPEnumeration::getMachineName( void ) if (gethostname(hostname, sizeof(hostname))) { DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d", WSAGetLastError())); - return NULL; + return AsciiString(); } return AsciiString(hostname); From 8c6a7ceba25bfbc2792d9a75a4e1fd7e872e31e3 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 1 Dec 2025 21:47:36 +0100 Subject: [PATCH 2/2] Changed to double quotation marks. --- Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp b/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp index edf47e89588..9336b820640 100644 --- a/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp +++ b/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp @@ -172,12 +172,12 @@ AsciiString IPEnumeration::getMachineName( void ) int err = WSAStartup(verReq, &wsadata); if (err != 0) { - return AsciiString(); + return ""; } if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) { WSACleanup(); - return AsciiString(); + return ""; } m_isWinsockInitialized = true; } @@ -187,7 +187,7 @@ AsciiString IPEnumeration::getMachineName( void ) if (gethostname(hostname, sizeof(hostname))) { DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d", WSAGetLastError())); - return AsciiString(); + return ""; } return AsciiString(hostname);