ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some uses of NULL that have snuck back in during a merge.

Browse Source
This commit is contained in:
Sadie Powell 2023-05-07 19:27:59 +01:00
parent 1b7026e2e1
commit 1aead0066a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/m_codepage.cpp
View File

@ -233,7 +233,7 @@ private:
Modes::ChangeList changelist; Modes::ChangeList changelist;
for (const auto& [_, mh] : ServerInstance->Modes.GetModes(MODETYPE_CHANNEL)) for (const auto& [_, mh] : ServerInstance->Modes.GetModes(MODETYPE_CHANNEL))
mh->RemoveMode(chan, changelist); mh->RemoveMode(chan, changelist);
ServerInstance->Modes.Process(ServerInstance->FakeClient, chan, NULL, changelist, ModeParser::MODE_LOCALONLY); ServerInstance->Modes.Process(ServerInstance->FakeClient, chan, nullptr, changelist, ModeParser::MODE_LOCALONLY);
// The channel will be destroyed automatically by CheckDestroy. // The channel will be destroyed automatically by CheckDestroy.
} }

2
win/inspircd_win32wrapper.h
View File

@ -146,7 +146,7 @@ inline ssize_t writev(int fd, const WindowsIOVec* iov, int count)
inline std::string GetErrorMessage(DWORD dwErrorCode) inline std::string GetErrorMessage(DWORD dwErrorCode)
{ {
char szErrorString[1024]; char szErrorString[1024];
if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0) if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), nullptr) == 0)
sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode); sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
return szErrorString; return szErrorString;
} }