Skip to content

refactor(network): Replace implicit conversion from NULL to AsciiString in IPEnumeration::getMachineName #1934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Dec 2, 2025
Merged

refactor(network): Replace implicit conversion from NULL to AsciiString in IPEnumeration::getMachineName #1934

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5361b7
refactor: Replace implicit conversion from NULL to AsciiString
Caball009 Dec 1, 2025
8c6a7ce
Changed to double quotation marks.
Caball009 Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
Expand Down
Loading