From a7c24ca48995cf2bf436156302f96b91bf135409 Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Mon, 13 Nov 2017 15:03:31 +0100 Subject: Code modernize ... * replace 0/NULL with nullptr [using clang-tidy] --- protocols/EmLanProto/src/lan.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/EmLanProto/src/lan.cpp') diff --git a/protocols/EmLanProto/src/lan.cpp b/protocols/EmLanProto/src/lan.cpp index d473bca9df..336e64bb75 100644 --- a/protocols/EmLanProto/src/lan.cpp +++ b/protocols/EmLanProto/src/lan.cpp @@ -9,8 +9,8 @@ CLan::CLan() m_filesoc = INVALID_SOCKET; m_status = LS_OK; m_mode = LM_OFF; - m_hListenThread = NULL; - m_hAcceptTCPThread = NULL; + m_hListenThread = nullptr; + m_hAcceptTCPThread = nullptr; Startup(); } @@ -69,11 +69,11 @@ void CLan::StopListen() if (m_hListenThread) { shutdown(m_income, SD_BOTH); WaitForSingleObject(m_hListenThread, INFINITE); - m_hListenThread = NULL; + m_hListenThread = nullptr; } if (m_hAcceptTCPThread) { TerminateThread(m_hAcceptTCPThread, 0); - m_hAcceptTCPThread = NULL; + m_hAcceptTCPThread = nullptr; } if (m_income != INVALID_SOCKET) { closesocket(m_income); @@ -133,7 +133,7 @@ void CLan::StartListen() m_hListenThread = mir_forkthread(ListenProc, (void*)this); m_hAcceptTCPThread = mir_forkthread(AcceptTCPProc, (void*)this); - if (m_hListenThread == NULL || m_hAcceptTCPThread == NULL) { + if (m_hListenThread == nullptr || m_hAcceptTCPThread == nullptr) { m_mode = LM_ON; m_status = LS_CANT_CREATE_THREADS; StopListen(); @@ -174,7 +174,7 @@ void CLan::Listen() OnRecvPacket((u_char*)buf, recLen, addr.sin_addr); } } - m_hListenThread = NULL; + m_hListenThread = nullptr; } void CLan::SendPacketBroadcast(const u_char* mes, int len) @@ -219,7 +219,7 @@ void CLan::AcceptTCP() mir_forkthread(OnInTCPConnectionProc, (void*)tcp_conn); Sleep(100); } - m_hAcceptTCPThread = NULL; + m_hAcceptTCPThread = nullptr; } void __cdecl CLan::OnInTCPConnectionProc(void *lpParameter) -- cgit v1.2.3