code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@7913 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 406 insertions, 398 deletions

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index abb59fa2e6..f1daa53f6a 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -58,8 +58,8 @@ CIrcMessage::CIrcMessage(const CIrcMessage& m) :
 	prefix.sUser = m.prefix.sUser;

 	prefix.sHost = m.prefix.sHost;

 

-	for ( int i=0; i < m.parameters.getCount(); i++ )

-		parameters.insert( new CMString( m.parameters[i] ));

+	for (int i = 0; i < m.parameters.getCount(); i++)

+		parameters.insert(new CMString(m.parameters[i]));

 }

 

 CIrcMessage::~CIrcMessage()

@@ -77,7 +77,7 @@ void CIrcMessage::Reset()
 

 CIrcMessage& CIrcMessage::operator = (const CIrcMessage& m)

 {

-	if ( &m != this ) {

+	if (&m != this) {

 		sCommand = m.sCommand;

 		parameters = m.parameters;

 		prefix.sNick = m.prefix.sNick;

@@ -102,89 +102,93 @@ void CIrcMessage::ParseIrcCommand(const TCHAR* lpszCmdLine)
 	const TCHAR* p2 = lpszCmdLine;

 

 	// prefix exists ?

-	if ( *p1 == ':' ) {

+	if (*p1 == ':') {

 		// break prefix into its components (nick!user@host)

 		p2 = ++p1;

-		while( *p2 && !_tcschr( _T(" !"), *p2 ))

+		while (*p2 && !_tcschr(_T(" !"), *p2))

 			++p2;

 		prefix.sNick.SetString(p1, p2 - p1);

-		if ( *p2 != '!' )

+		if (*p2 != '!')

 			goto end_of_prefix;

 		p1 = ++p2;

-		while( *p2 && !_tcschr( _T(" @"), *p2 ))

+		while (*p2 && !_tcschr(_T(" @"), *p2))

 			++p2;

 		prefix.sUser.SetString(p1, p2 - p1);

-		if ( *p2 != '@' )

+		if (*p2 != '@')

 			goto end_of_prefix;

 		p1 = ++p2;

-		while( *p2 && *p2 != ' ' )

+		while (*p2 && *p2 != ' ')

 			++p2;

 		prefix.sHost.SetString(p1, p2 - p1);

-end_of_prefix :

-		while( *p2 && *p2 == ' ' )

+end_of_prefix:

+		while (*p2 && *p2 == ' ')

 			++p2;

 		p1 = p2;

 	}

 

 	// get command

 	p2 = p1;

-	while( *p2 && *p2 != ' ' )

+	while (*p2 && *p2 != ' ')

 		++p2;

 

 	sCommand.SetString(p1, p2 - p1);

 	sCommand.MakeUpper();

-	while( *p2 && *p2 == ' ' )

+	while (*p2 && *p2 == ' ')

 		++p2;

 	p1 = p2;

 

 	// get parameters

-	while( *p1 ) {

-		if ( *p1 == ':' ) {

+	while (*p1) {

+		if (*p1 == ':') {

 			++p1;

 

 			// seek end-of-message

-			while( *p2 )

+			while (*p2)

 				++p2;

-			parameters.insert( new CMString(p1, p2 - p1));

+			parameters.insert(new CMString(p1, p2 - p1));

 			break;

 		}

 		else {

 			// seek end of parameter

-			while( *p2 && *p2 != ' ' )

+			while (*p2 && *p2 != ' ')

 				++p2;

-			parameters.insert( new CMString(p1, p2 - p1));

+			parameters.insert(new CMString(p1, p2 - p1));

 			// see next parameter

-			while( *p2 && *p2 == ' ' )

+			while (*p2 && *p2 == ' ')

 				++p2;

 			p1 = p2;

-}	}	}

+		}

+	}

+}

 

 ////////////////////////////////////////////////////////////////////

 

 int CIrcProto::getCodepage() const

 {

-	return ( con != NULL ) ? codepage : CP_ACP;

+	return (con != NULL) ? codepage : CP_ACP;

 }

 

-void CIrcProto::SendIrcMessage( const TCHAR* msg, bool bNotify, int codepage )

+void CIrcProto::SendIrcMessage(const TCHAR* msg, bool bNotify, int codepage)

 {

-	if ( codepage == -1 )

+	if (codepage == -1)

 		codepage = getCodepage();

 

-	if ( this ) {

-		char* str = mir_t2a_cp( msg, codepage );

-		rtrim( str );

-		int cbLen = (int)strlen( str );

-		str = ( char* )mir_realloc( str, cbLen+3 );

-		strcat( str, "\r\n" );

-		NLSend(( const BYTE* )str, cbLen+2 );

-		mir_free( str );

-		

-		if ( bNotify ) {

-			CIrcMessage ircMsg( this, msg, codepage );

-			if ( !ircMsg.sCommand.IsEmpty() && ircMsg.sCommand != _T("QUIT"))

-				Notify( &ircMsg );

-}	}	}

+	if (this) {

+		char* str = mir_t2a_cp(msg, codepage);

+		rtrim(str);

+		int cbLen = (int)strlen(str);

+		str = (char*)mir_realloc(str, cbLen + 3);

+		strcat(str, "\r\n");

+		NLSend((const BYTE*)str, cbLen + 2);

+		mir_free(str);

+

+		if (bNotify) {

+			CIrcMessage ircMsg(this, msg, codepage);

+			if (!ircMsg.sCommand.IsEmpty() && ircMsg.sCommand != _T("QUIT"))

+				Notify(&ircMsg);

+		}

+	}

+}

 

 bool CIrcProto::Connect(const CIrcSessionInfo& info)

 {

@@ -205,15 +209,16 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 

 	FindLocalIP(con); // get the local ip used for filetransfers etc

 

-	if ( info.m_iSSL > 0 ) {

-		if ( !CallService(MS_NETLIB_STARTSSL, (WPARAM)con, 0) && info.m_iSSL == 2) {

-			Netlib_CloseHandle( con );

+	if (info.m_iSSL > 0) {

+		if (!CallService(MS_NETLIB_STARTSSL, (WPARAM)con, 0) && info.m_iSSL == 2) {

+			Netlib_CloseHandle(con);

 			con = NULL;

 			m_info.Reset();

 			return false;

-	}	}

+		}

+	}

 

-	if ( Miranda_Terminated()) {

+	if (Miranda_Terminated()) {

 		Disconnect();

 		return false;

 	}

@@ -221,22 +226,22 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 	m_info = info;

 

 	// start receiving messages from host

-	ForkThread( &CIrcProto::ThreadProc, NULL );

-	Sleep( 100 );

-	if ( info.sPassword.GetLength())

-		NLSend( "PASS %s\r\n", info.sPassword.c_str());

-	NLSend( _T("NICK %s\r\n"), info.sNick.c_str());

+	ForkThread(&CIrcProto::ThreadProc, NULL);

+	Sleep(100);

+	if (info.sPassword.GetLength())

+		NLSend("PASS %s\r\n", info.sPassword.c_str());

+	NLSend(_T("NICK %s\r\n"), info.sNick.c_str());

 

 	CMString m_userID = GetWord(info.sUserID.c_str(), 0);

 	TCHAR szHostName[MAX_PATH];

-	DWORD cbHostName = SIZEOF( szHostName );

+	DWORD cbHostName = SIZEOF(szHostName);

 	GetComputerName(szHostName, &cbHostName);

 	CMString HostName = GetWord(szHostName, 0);

-	if ( m_userID.IsEmpty())

+	if (m_userID.IsEmpty())

 		m_userID = _T("Miranda");

-	if ( HostName.IsEmpty())

-		HostName= _T("host");

-	NLSend( _T("USER %s %s %s :%s\r\n"), m_userID.c_str(), HostName.c_str(), _T("server"), info.sFullName.c_str());

+	if (HostName.IsEmpty())

+		HostName = _T("host");

+	NLSend(_T("USER %s %s %s :%s\r\n"), m_userID.c_str(), HostName.c_str(), _T("server"), info.sFullName.c_str());

 

 	return con != NULL;

 }

@@ -245,19 +250,19 @@ void CIrcProto::Disconnect(void)
 {

 	static const DWORD dwServerTimeout = 5 * 1000;

 

-	if ( con == NULL )

+	if (con == NULL)

 		return;

 

 	KillIdent();

 

-	if ( m_quitMessage && m_quitMessage[0] )

-		NLSend( _T("QUIT :%s\r\n"), m_quitMessage);

+	if (m_quitMessage && m_quitMessage[0])

+		NLSend(_T("QUIT :%s\r\n"), m_quitMessage);

 	else

-		NLSend( "QUIT \r\n" );

+		NLSend("QUIT \r\n");

 

 	Sleep(50);

 

-	if ( con )

+	if (con)

 		Netlib_Shutdown(con);

 

 	m_info.Reset();

@@ -269,60 +274,60 @@ void CIrcProto::Notify(const CIrcMessage* pmsg)
 	OnIrcMessage(pmsg);

 }

 

-int CIrcProto::NLSend( const unsigned char* buf, int cbBuf)

+int CIrcProto::NLSend(const unsigned char* buf, int cbBuf)

 {

-	if ( m_bMbotInstalled && m_scriptingEnabled ) {

+	if (m_bMbotInstalled && m_scriptingEnabled) {

 		int iVal = NULL;

 		char * pszTemp = 0;

-		pszTemp = ( char* ) mir_alloc( lstrlenA((const char *) buf ) + 1);

-		lstrcpynA(pszTemp, (const char *)buf, lstrlenA ((const char *)buf) + 1);

+		pszTemp = (char*)mir_alloc(lstrlenA((const char *)buf) + 1);

+		lstrcpynA(pszTemp, (const char *)buf, lstrlenA((const char *)buf) + 1);

 

-		if ( Scripting_TriggerMSPRawOut(&pszTemp) && pszTemp ) {

+		if (Scripting_TriggerMSPRawOut(&pszTemp) && pszTemp) {

 			if (con)

 				iVal = Netlib_Send(con, (const char*)pszTemp, lstrlenA(pszTemp), MSG_DUMPASTEXT);

 		}

-		if ( pszTemp )

-			mir_free( pszTemp );

+		if (pszTemp)

+			mir_free(pszTemp);

 

 		return iVal;

 	}

-	

+

 	if (con)

 		return Netlib_Send(con, (const char*)buf, cbBuf, MSG_DUMPASTEXT);

 

 	return 0;

 }

 

-int CIrcProto::NLSend( const TCHAR* fmt, ...)

+int CIrcProto::NLSend(const TCHAR* fmt, ...)

 {

 	va_list marker;

 	va_start(marker, fmt);

 

-	TCHAR szBuf[1024*4];

+	TCHAR szBuf[1024 * 4];

 	mir_vsntprintf(szBuf, SIZEOF(szBuf), fmt, marker);

 	va_end(marker);

 

-	char* buf = mir_t2a_cp( szBuf, getCodepage());

+	char* buf = mir_t2a_cp(szBuf, getCodepage());

 	int result = NLSend((unsigned char*)buf, (int)strlen(buf));

-	mir_free( buf );

+	mir_free(buf);

 	return result;

 }

 

-int CIrcProto::NLSend( const char* fmt, ...)

+int CIrcProto::NLSend(const char* fmt, ...)

 {

 	va_list marker;

 	va_start(marker, fmt);

 

-	char szBuf[1024*4];

+	char szBuf[1024 * 4];

 	int cbLen = mir_vsnprintf(szBuf, SIZEOF(szBuf), fmt, marker);

 	va_end(marker);

 

-	return NLSend((unsigned char*)szBuf, cbLen );

+	return NLSend((unsigned char*)szBuf, cbLen);

 }

 

-int CIrcProto::NLSendNoScript( const unsigned char* buf, int cbBuf)

+int CIrcProto::NLSendNoScript(const unsigned char* buf, int cbBuf)

 {

-	if ( con )

+	if (con)

 		return Netlib_Send(con, (const char*)buf, cbBuf, MSG_DUMPASTEXT);

 

 	return 0;

@@ -330,101 +335,102 @@ int CIrcProto::NLSendNoScript( const unsigned char* buf, int cbBuf)
 

 int CIrcProto::NLReceive(unsigned char* buf, int cbBuf)

 {

-	return Netlib_Recv( con, (char*)buf, cbBuf, MSG_DUMPASTEXT );

+	return Netlib_Recv(con, (char*)buf, cbBuf, MSG_DUMPASTEXT);

 }

 

 void CIrcProto::KillIdent()

 {

-	if ( hBindPort ) {

+	if (hBindPort) {

 		HANDLE hPort = hBindPort;

 		hBindPort = NULL;

-		Netlib_CloseHandle( hPort );

+		Netlib_CloseHandle(hPort);

 	}

 }

 

 void CIrcProto::InsertIncomingEvent(TCHAR* pszRaw)

 {

-	CIrcMessage msg( this, pszRaw, true);

-	Notify( &msg );

+	CIrcMessage msg(this, pszRaw, true);

+	Notify(&msg);

 	return;

 }

 

-void CIrcProto::createMessageFromPchar( const char* p )

+void CIrcProto::createMessageFromPchar(const char* p)

 {

 	TCHAR* ptszMsg;

-	if ( codepage != CP_UTF8 && m_utfAutodetect ) {

-		if ( mir_utf8decodecp( NEWSTR_ALLOCA(p), codepage, &ptszMsg ) == NULL )

-				ptszMsg = mir_a2t_cp( p, codepage );

+	if (codepage != CP_UTF8 && m_utfAutodetect) {

+		if (mir_utf8decodecp(NEWSTR_ALLOCA(p), codepage, &ptszMsg) == NULL)

+			ptszMsg = mir_a2t_cp(p, codepage);

 	}

-	else ptszMsg = mir_a2t_cp( p, codepage );

-	CIrcMessage msg( this, ptszMsg, codepage, true );

-	Notify( &msg );

-	mir_free( ptszMsg );

+	else ptszMsg = mir_a2t_cp(p, codepage);

+	CIrcMessage msg(this, ptszMsg, codepage, true);

+	Notify(&msg);

+	mir_free(ptszMsg);

 }

 

 void CIrcProto::DoReceive()

 {

-	char chBuf[1024*4+1];

+	char chBuf[1024 * 4 + 1];

 	int cbInBuf = 0;

-	

-	if ( m_info.bIdentServer && m_info.iIdentServerPort != NULL ) {

-		NETLIBBIND nb = {0};

+

+	if (m_info.bIdentServer && m_info.iIdentServerPort != NULL) {

+		NETLIBBIND nb = { 0 };

 		nb.cbSize = sizeof(NETLIBBIND);

 		nb.pfnNewConnectionV2 = DoIdent;

 		nb.pExtra = this;

 		nb.wPort = m_info.iIdentServerPort;

 		hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_hNetlibUser, (LPARAM)&nb);

-		if ( !hBindPort || nb.wPort != m_info.iIdentServerPort ) {

+		if (!hBindPort || nb.wPort != m_info.iIdentServerPort) {

 			debugLogA("Error: unable to bind local port %u", m_info.iIdentServerPort);

 			KillIdent();

-	}	}

+		}

+	}

 

-	while( con ) {

+	while (con) {

 		int nLinesProcessed = 0;

 

-		int cbRead = NLReceive((unsigned char*)chBuf+cbInBuf, sizeof(chBuf)-cbInBuf-1);

-		if ( cbRead <= 0 )

+		int cbRead = NLReceive((unsigned char*)chBuf + cbInBuf, sizeof(chBuf)-cbInBuf - 1);

+		if (cbRead <= 0)

 			break;

 

 		cbInBuf += cbRead;

 		chBuf[cbInBuf] = '\0';

 

 		char* pStart = chBuf;

-		while( *pStart ) {

+		while (*pStart) {

 			char* pEnd;

 

 			// seek end-of-line

-			for(pEnd=pStart; *pEnd && *pEnd != '\r' && *pEnd != '\n'; ++pEnd)

+			for (pEnd = pStart; *pEnd && *pEnd != '\r' && *pEnd != '\n'; ++pEnd)

 				;

-			if ( *pEnd == '\0' )

+			if (*pEnd == '\0')

 				break; // uncomplete message. stop parsing.

 

 			++nLinesProcessed;

 

 			// replace end-of-line with NULLs and skip

-			while( *pEnd == '\r' || *pEnd == '\n' )

+			while (*pEnd == '\r' || *pEnd == '\n')

 				*pEnd++ = '\0';

 

 			// process single message by monitor objects

-			if ( *pStart ) {

-				if ( m_bMbotInstalled && m_scriptingEnabled ) {

-					char* pszTemp = mir_strdup( pStart ); 

+			if (*pStart) {

+				if (m_bMbotInstalled && m_scriptingEnabled) {

+					char* pszTemp = mir_strdup(pStart);

 

-					if ( Scripting_TriggerMSPRawIn( &pszTemp ) && pszTemp ) {

+					if (Scripting_TriggerMSPRawIn(&pszTemp) && pszTemp) {

 						char* p1 = pszTemp;

 						// replace end-of-line with NULLs

-						while( *p1 != '\0' ) {

-							if ( *p1 == '\r' || *p1 == '\n')

+						while (*p1 != '\0') {

+							if (*p1 == '\r' || *p1 == '\n')

 								*p1 = '\0';

 							p1++;

 						}

 

-						createMessageFromPchar( pszTemp );

+						createMessageFromPchar(pszTemp);

 					}

 

-					mir_free( pszTemp );

+					mir_free(pszTemp);

 				}

-				else createMessageFromPchar( pStart );

+				else createMessageFromPchar(pStart);

 			}

 

 			cbInBuf -= pEnd - pStart;

@@ -432,11 +438,11 @@ void CIrcProto::DoReceive()
 		}

 

 		// discard processed messages

-		if ( nLinesProcessed != 0 )

-			memmove(chBuf, pStart, cbInBuf+1);

+		if (nLinesProcessed != 0)

+			memmove(chBuf, pStart, cbInBuf + 1);

 	}

 

-	if ( con ) {

+	if (con) {

 		Netlib_CloseHandle(con);

 		con = NULL;

 	}

@@ -445,9 +451,9 @@ void CIrcProto::DoReceive()
 	Notify(NULL);

 }

 

-void __cdecl CIrcProto::ThreadProc( void* )

+void __cdecl CIrcProto::ThreadProc(void*)

 {

-	DoReceive(); 

+	DoReceive();

 	m_info.Reset();

 }

 

@@ -456,10 +462,10 @@ void CIrcProto::AddDCCSession(HANDLE, CDccSession* dcc)
 	EnterCriticalSection(&m_dcc);

 

 	CDccSession* p = m_dcc_chats.find(dcc);

-	if ( p )

-		m_dcc_chats.remove( p );

+	if (p)

+		m_dcc_chats.remove(p);

 

-	m_dcc_chats.insert( dcc );

+	m_dcc_chats.insert(dcc);

 

 	LeaveCriticalSection(&m_dcc);

 }

@@ -468,7 +474,7 @@ void CIrcProto::AddDCCSession(DCCINFO*, CDccSession* dcc)
 {

 	EnterCriticalSection(&m_dcc);

 

-	m_dcc_xfers.insert( dcc );

+	m_dcc_xfers.insert(dcc);

 

 	LeaveCriticalSection(&m_dcc);

 }

@@ -477,11 +483,11 @@ void CIrcProto::RemoveDCCSession(HANDLE hContact)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_chats.getCount(); i++ )

-		if ( m_dcc_chats[i]->di->hContact == hContact ) {

-			m_dcc_chats.remove( i );

-			break;

-		}

+	for (int i = 0; i < m_dcc_chats.getCount(); i++)

+	if (m_dcc_chats[i]->di->hContact == hContact) {

+		m_dcc_chats.remove(i);

+		break;

+	}

 

 	LeaveCriticalSection(&m_dcc);

 }

@@ -490,11 +496,11 @@ void CIrcProto::RemoveDCCSession(DCCINFO* pdci)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_xfers.getCount(); i++ )

-		if ( m_dcc_xfers[i]->di == pdci ) {

-			m_dcc_xfers.remove( i );

-			break;

-		}

+	for (int i = 0; i < m_dcc_xfers.getCount(); i++)

+	if (m_dcc_xfers[i]->di == pdci) {

+		m_dcc_xfers.remove(i);

+		break;

+	}

 

 	LeaveCriticalSection(&m_dcc);

 }

@@ -503,11 +509,11 @@ CDccSession* CIrcProto::FindDCCSession(HANDLE hContact)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_chats.getCount(); i++ )

-		if ( m_dcc_chats[i]->di->hContact == hContact ) {

-			LeaveCriticalSection(&m_dcc);

-			return m_dcc_chats[ i ];

-		}

+	for (int i = 0; i < m_dcc_chats.getCount(); i++)

+	if (m_dcc_chats[i]->di->hContact == hContact) {

+		LeaveCriticalSection(&m_dcc);

+		return m_dcc_chats[i];

+	}

 

 	LeaveCriticalSection(&m_dcc);

 	return 0;

@@ -517,11 +523,11 @@ CDccSession* CIrcProto::FindDCCSession(DCCINFO* pdci)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_xfers.getCount(); i++ )

-		if ( m_dcc_xfers[i]->di == pdci ) {

-			LeaveCriticalSection(&m_dcc);

-			return m_dcc_xfers[ i ];

-		}

+	for (int i = 0; i < m_dcc_xfers.getCount(); i++)

+	if (m_dcc_xfers[i]->di == pdci) {

+		LeaveCriticalSection(&m_dcc);

+		return m_dcc_xfers[i];

+	}

 

 	LeaveCriticalSection(&m_dcc);

 	return 0;

@@ -531,9 +537,9 @@ CDccSession* CIrcProto::FindDCCSendByPort(int iPort)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_xfers.getCount(); i++ ) {

+	for (int i = 0; i < m_dcc_xfers.getCount(); i++) {

 		CDccSession* p = m_dcc_xfers[i];

-		if ( p->di->iType == DCC_SEND && p->di->bSender && iPort == p->di->iPort ) {

+		if (p->di->iType == DCC_SEND && p->di->bSender && iPort == p->di->iPort) {

 			LeaveCriticalSection(&m_dcc);

 			return p;

 		}

@@ -547,11 +553,11 @@ CDccSession* CIrcProto::FindDCCRecvByPortAndName(int iPort, const TCHAR* szName)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_xfers.getCount(); i++ ) {

+	for (int i = 0; i < m_dcc_xfers.getCount(); i++) {

 		CDccSession* p = m_dcc_xfers[i];

 		DBVARIANT dbv;

-		if ( !getTString(p->di->hContact, "Nick", &dbv)) {

-			if ( p->di->iType == DCC_SEND && !p->di->bSender && !lstrcmpi( szName, dbv.ptszVal) && iPort == p->di->iPort ) {

+		if (!getTString(p->di->hContact, "Nick", &dbv)) {

+			if (p->di->iType == DCC_SEND && !p->di->bSender && !lstrcmpi(szName, dbv.ptszVal) && iPort == p->di->iPort) {

 				db_free(&dbv);

 				LeaveCriticalSection(&m_dcc);

 				return p;

@@ -568,10 +574,10 @@ CDccSession* CIrcProto::FindPassiveDCCSend(int iToken)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_xfers.getCount(); i++ ) {

-		if ( m_dcc_xfers[ i ]->iToken == iToken ) {

+	for (int i = 0; i < m_dcc_xfers.getCount(); i++) {

+		if (m_dcc_xfers[i]->iToken == iToken) {

 			LeaveCriticalSection(&m_dcc);

-			return m_dcc_xfers[ i ];

+			return m_dcc_xfers[i];

 		}

 	}

 

@@ -583,9 +589,9 @@ CDccSession* CIrcProto::FindPassiveDCCRecv(CMString sName, CMString sToken)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_xfers.getCount(); i++ ) {

+	for (int i = 0; i < m_dcc_xfers.getCount(); i++) {

 		CDccSession* p = m_dcc_xfers[i];

-		if ( sToken == p->di->sToken && sName == p->di->sContactName ) {

+		if (sToken == p->di->sToken && sName == p->di->sContactName) {

 			LeaveCriticalSection(&m_dcc);

 			return p;

 		}

@@ -598,9 +604,9 @@ void CIrcProto::DisconnectAllDCCSessions(bool Shutdown)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_chats.getCount(); i++ )

-		if ( m_disconnectDCCChats || Shutdown )

-			m_dcc_chats[i]->Disconnect();

+	for (int i = 0; i < m_dcc_chats.getCount(); i++)

+	if (m_disconnectDCCChats || Shutdown)

+		m_dcc_chats[i]->Disconnect();

 

 	LeaveCriticalSection(&m_dcc);

 }

@@ -609,15 +615,15 @@ void CIrcProto::CheckDCCTimeout(void)
 {

 	EnterCriticalSection(&m_dcc);

 

-	for ( int i=0; i < m_dcc_chats.getCount(); i++ ) {

+	for (int i = 0; i < m_dcc_chats.getCount(); i++) {

 		CDccSession* p = m_dcc_chats[i];

-		if ( time(0) > p->tLastActivity + DCCCHATTIMEOUT )

+		if (time(0) > p->tLastActivity + DCCCHATTIMEOUT)

 			p->Disconnect();

 	}

 

-	for ( int j=0; j < m_dcc_xfers.getCount(); j++ ) {

+	for (int j = 0; j < m_dcc_xfers.getCount(); j++) {

 		CDccSession* p = m_dcc_xfers[j];

-		if ( time(0) > p->tLastActivity + DCCSENDTIMEOUT )

+		if (time(0) > p->tLastActivity + DCCSENDTIMEOUT)

 			p->Disconnect();

 	}

 

@@ -626,17 +632,17 @@ void CIrcProto::CheckDCCTimeout(void)
 

 ////////////////////////////////////////////////////////////////////

 

-CIrcIgnoreItem::CIrcIgnoreItem( const TCHAR* _mask, const TCHAR* _flags, const TCHAR* _network ) :

-	mask( _mask ),

-	flags( _flags ),

-	network( _network )

+CIrcIgnoreItem::CIrcIgnoreItem(const TCHAR* _mask, const TCHAR* _flags, const TCHAR* _network) :

+	mask(_mask),

+	flags(_flags),

+	network(_network)

 {

 }

 

-CIrcIgnoreItem::CIrcIgnoreItem( int codepage, const char* _mask, const char* _flags, const char* _network ) :

-	mask( (TCHAR *)_A2T( _mask, codepage )),

-	flags( (TCHAR *)_A2T( _flags, codepage )),

-	network( (TCHAR *)_A2T( _network, codepage ))

+CIrcIgnoreItem::CIrcIgnoreItem(int codepage, const char* _mask, const char* _flags, const char* _network) :

+	mask((TCHAR*)_A2T(_mask, codepage)),

+	flags((TCHAR*)_A2T(_flags, codepage)),

+	network((TCHAR*)_A2T(_network, codepage))

 {

 }

 

@@ -690,32 +696,31 @@ void CIrcSessionInfo::Reset()
 

 void CIrcProto::OnIrcMessage(const CIrcMessage* pmsg)

 {

-	if ( pmsg != NULL ) {

-		PfnIrcMessageHandler pfn = FindMethod( pmsg->sCommand.c_str());

-		if ( pfn ) {

+	if (pmsg != NULL) {

+		PfnIrcMessageHandler pfn = FindMethod(pmsg->sCommand.c_str());

+		if (pfn) {

 			// call member function. if it returns 'false',

 			// call the default handling

-			__try

-			{

-				if ( !(this->*pfn)( pmsg ))

-					OnIrcDefault( pmsg );

+			__try {

+				if (!(this->*pfn)(pmsg))

+					OnIrcDefault(pmsg);

 			}

-			__except( EXCEPTION_EXECUTE_HANDLER ) // dedicated to Sava :)

+			__except (EXCEPTION_EXECUTE_HANDLER) // dedicated to Sava :)

 			{

-				debugLogA( "IRC handler feels sick: %S", pmsg->sCommand.c_str());

+				debugLogA("IRC handler feels sick: %S", pmsg->sCommand.c_str());

 			}

 		}

 		else // handler not found. call default handler

-			OnIrcDefault( pmsg );

+			OnIrcDefault(pmsg);

 	}

 	else OnIrcDisconnected();

 }

 

 PfnIrcMessageHandler CIrcProto::FindMethod(const TCHAR* lpszName)

 {

-	CIrcHandler temp( lpszName, NULL );

-	CIrcHandler* p = m_handlers.find( &temp );

-	return ( p == NULL ) ? NULL : p->m_handler;

+	CIrcHandler temp(lpszName, NULL);

+	CIrcHandler* p = m_handlers.find(&temp);

+	return (p == NULL) ? NULL : p->m_handler;

 }

 

 ////////////////////////////////////////////////////////////////////

@@ -733,15 +738,15 @@ char* ConvertIntegerToIP(unsigned long int_ip_addr)
 	in.S_un.S_un_b.s_b3 = intemp.S_un.S_un_b.s_b2;

 	in.S_un.S_un_b.s_b4 = intemp.S_un.S_un_b.s_b1;

 

-	return inet_ntoa( in );

+	return inet_ntoa(in);

 }

 

-unsigned long ConvertIPToInteger( char* IP )

+unsigned long ConvertIPToInteger(char* IP)

 {

 	IN_ADDR in;

 	IN_ADDR intemp;

 

-	if ( IP == 0 || lstrlenA(IP) == 0)

+	if (IP == 0 || lstrlenA(IP) == 0)

 		return 0;

 

 	intemp.S_un.S_addr = inet_addr(IP);

@@ -756,8 +761,8 @@ unsigned long ConvertIPToInteger( char* IP )
 ////////////////////////////////////////////////////////////////////

 

 // initialize basic stuff needed for the dcc objects, also start a timer for checking the status of connections (timeouts)

-CDccSession::CDccSession( CIrcProto* _pro, DCCINFO* pdci ) :

-	m_proto( _pro ),

+CDccSession::CDccSession(CIrcProto* _pro, DCCINFO* pdci) :

+	m_proto(_pro),

 	NewFileName(0),

 	dwWhatNeedsDoing(0),

 	tLastPercentageUpdate(0),

@@ -775,67 +780,68 @@ CDccSession::CDccSession( CIrcProto* _pro, DCCINFO* pdci ) :
 	ZeroMemory(&pfts, sizeof(PROTOFILETRANSFERSTATUS));

 	pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

 

-	if(di->iType == DCC_SEND && di->bSender == false)

+	if (di->iType == DCC_SEND && di->bSender == false)

 		hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);

 

-	if(nDcc == 0)

-		m_proto->SetChatTimer(m_proto->DCCTimer, 20*1000, DCCTimerProc);

+	if (nDcc == 0)

+		m_proto->SetChatTimer(m_proto->DCCTimer, 20 * 1000, DCCTimerProc);

 

 	nDcc++; // increase the count of existing objects

 

 	iGlobalToken++;

-	if(iGlobalToken == 1000)

+	if (iGlobalToken == 1000)

 		iGlobalToken = 1;

 	iToken = iGlobalToken;

 

-	iPacketSize = m_proto->getWord( "PacketSize", 4096 );

+	iPacketSize = m_proto->getWord("PacketSize", 4096);

 

-	if ( di->dwAdr )

+	if (di->dwAdr)

 		m_proto->setDword(di->hContact, "IP", di->dwAdr); // mtooltip stuff

 }

 

 CDccSession::~CDccSession() // destroy all that needs destroying

 {

-	if ( di->iType == DCC_SEND ) {

+	if (di->iType == DCC_SEND) {

 		// ack SUCCESS or FAILURE

-		if (dwTotal == di->dwSize )

+		if (dwTotal == di->dwSize)

 			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (void *)di, 0);

 		else

 			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, (void *)di, 0);

 	}

 

-	if ( di->iType == DCC_CHAT ) {

+	if (di->iType == DCC_CHAT) {

 		CDccSession* dcc = m_proto->FindDCCSession(di->hContact);

-		if ( dcc && this == dcc ) {

+		if (dcc && this == dcc) {

 			m_proto->RemoveDCCSession(di->hContact); // objects automatically remove themselves from the list of objects

 			m_proto->setWord(di->hContact, "Status", ID_STATUS_OFFLINE);

-	}	}

+		}

+	}

 

-	if ( di->iType == DCC_SEND )

-		m_proto->RemoveDCCSession( di ); 

+	if (di->iType == DCC_SEND)

+		m_proto->RemoveDCCSession(di);

 

-	if ( hEvent != NULL ) {

-		SetEvent( hEvent );

-		CloseHandle( hEvent );

+	if (hEvent != NULL) {

+		SetEvent(hEvent);

+		CloseHandle(hEvent);

 		hEvent = NULL;

 	}

 

 	delete di;

 	nDcc--;

 

-	if ( nDcc < 0 )

+	if (nDcc < 0)

 		nDcc = 0;

 

-	if ( nDcc == 0 )

-		m_proto->KillChatTimer( m_proto->DCCTimer ); // destroy the timer when no dcc objects remain

+	if (nDcc == 0)

+		m_proto->KillChatTimer(m_proto->DCCTimer); // destroy the timer when no dcc objects remain

 }

 

-int CDccSession::NLSend(const unsigned char* buf, int cbBuf) 

+int CDccSession::NLSend(const unsigned char* buf, int cbBuf)

 {

 	tLastActivity = time(0);

 

 	if (con)

-		return Netlib_Send(con, (const char*)buf, cbBuf, di->iType == DCC_CHAT?MSG_DUMPASTEXT:MSG_NODUMP);

+		return Netlib_Send(con, (const char*)buf, cbBuf, di->iType == DCC_CHAT ? MSG_DUMPASTEXT : MSG_NODUMP);

 

 	return 0;

 }

@@ -844,8 +850,8 @@ int CDccSession::NLReceive(const unsigned char* buf, int cbBuf)
 {

 	int n = 0;

 

-	if(con)

-		n = Netlib_Recv(con, (char*)buf, cbBuf, di->iType == DCC_CHAT?MSG_DUMPASTEXT:MSG_NODUMP);

+	if (con)

+		n = Netlib_Recv(con, (char*)buf, cbBuf, di->iType == DCC_CHAT ? MSG_DUMPASTEXT : MSG_NODUMP);

 

 	tLastActivity = time(0);

 	return n;

@@ -853,29 +859,29 @@ int CDccSession::NLReceive(const unsigned char* buf, int cbBuf)
 

 int CDccSession::SendStuff(const TCHAR* fmt)

 {

-	String buf = _T2A( fmt, m_proto->getCodepage());

-	return NLSend(( const unsigned char* )buf.c_str(), buf.GetLength());

+	String buf = _T2A(fmt, m_proto->getCodepage());

+	return NLSend((const unsigned char*)buf.c_str(), buf.GetLength());

 }

 

 // called when the user wants to connect/create a new connection given the parameters in the constructor.

 int CDccSession::Connect()

 {

-	if ( !di->bSender || di->bReverse ) {

-		if ( !con )

-			mir_forkthread( ConnectProc, this ); // spawn a new thread for time consuming activities, ie when connecting to a remote computer

+	if (!di->bSender || di->bReverse) {

+		if (!con)

+			mir_forkthread(ConnectProc, this); // spawn a new thread for time consuming activities, ie when connecting to a remote computer

 		return true;

 	}

 

-	if ( !con )

+	if (!con)

 		return SetupConnection(); // no need to spawn thread for setting up a listening port locally

 

-	return false; 

+	return false;

 }

 

-void __cdecl CDccSession::ConnectProc( void *pparam )

+void __cdecl CDccSession::ConnectProc(void *pparam)

 {

 	CDccSession* pThis = (CDccSession*)pparam;

-	if ( !pThis->con )

+	if (!pThis->con)

 		pThis->SetupConnection();

 }

 

@@ -891,38 +897,38 @@ void CDccSession::SetupPassive(DWORD adress, DWORD port)
 int CDccSession::SetupConnection()

 {

 	// if it is a dcc chat connection make sure it is "offline" to begin with, since no connection exists still

-	if ( di->iType == DCC_CHAT )

+	if (di->iType == DCC_CHAT)

 		m_proto->setWord(di->hContact, "Status", ID_STATUS_OFFLINE);

 

 	// Set up stuff needed for the filetransfer dialog (if it is a filetransfer)

-	if ( di->iType == DCC_SEND ) {

-		file[0] = ( TCHAR* )di->sFileAndPath.c_str();

+	if (di->iType == DCC_SEND) {

+		file[0] = (TCHAR*)di->sFileAndPath.c_str();

 		file[1] = 0;

 

-		pfts.tszCurrentFile = ( TCHAR* )di->sFileAndPath.c_str();

-		pfts.tszWorkingDir =	( TCHAR* )di->sPath.c_str();

+		pfts.tszCurrentFile = (TCHAR*)di->sFileAndPath.c_str();

+		pfts.tszWorkingDir = (TCHAR*)di->sPath.c_str();

 		pfts.hContact = di->hContact;

 		pfts.flags = PFTS_TCHAR + ((di->bSender) ? PFTS_SENDING : PFTS_RECEIVING);

-		pfts.totalFiles =	1;

+		pfts.totalFiles = 1;

 		pfts.currentFileNumber = 0;

-		pfts.totalBytes =	di->dwSize;

+		pfts.totalBytes = di->dwSize;

 		pfts.currentFileSize = pfts.totalBytes;

 		pfts.ptszFiles = file;

 		pfts.totalProgress = 0;

-		pfts.currentFileProgress =	0;

+		pfts.currentFileProgress = 0;

 		pfts.currentFileTime = (unsigned long)time(0);

 	}

 

 	// create a listening socket for outgoing chat/send requests. The remote computer connects to this computer. Used for both chat and filetransfer.

-	if ( di->bSender && !di->bReverse ) {

-		NETLIBBIND nb = {0};

+	if (di->bSender && !di->bReverse) {

+		NETLIBBIND nb = { 0 };

 		nb.cbSize = sizeof(NETLIBBIND);

 		nb.pfnNewConnectionV2 = DoIncomingDcc; // this is the (helper) function to be called once an incoming connection is made. The 'real' function that is called is IncomingConnection()

-		nb.pExtra = (void *)this; 

+		nb.pExtra = (void *)this;

 		nb.wPort = 0;

 		hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&nb);

 

-		if ( hBindPort == NULL ) {

+		if (hBindPort == NULL) {

 			delete this; // dcc objects destroy themselves when the connection has been closed or failed for some reasson.

 			return 0;

 		}

@@ -933,16 +939,16 @@ int CDccSession::SetupConnection()
 

 	// If a remote computer initiates a chat session this is used to connect to the remote computer (user already accepted at this point). 

 	// also used for connecting to a remote computer for remote file transfers

-	if ( di->iType == DCC_CHAT && !di->bSender || di->iType == DCC_SEND && di->bSender && di->bReverse ) {

+	if (di->iType == DCC_CHAT && !di->bSender || di->iType == DCC_SEND && di->bSender && di->bReverse) {

 		NETLIBOPENCONNECTION ncon = { 0 };

 		ncon.cbSize = sizeof(ncon);

-		ncon.szHost = ConvertIntegerToIP(di->dwAdr); 

-		ncon.wPort = (WORD) di->iPort;

+		ncon.szHost = ConvertIntegerToIP(di->dwAdr);

+		ncon.wPort = (WORD)di->iPort;

 		con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&ncon);

 	}

 

 	// If a remote computer initiates a filetransfer this is used to connect to that computer (the user has chosen to accept but it is possible the file exists/needs to be resumed etc still)

-	if ( di->iType == DCC_SEND && !di->bSender ) {

+	if (di->iType == DCC_SEND && !di->bSender) {

 

 		// this following code is for miranda to be able to show the resume/overwrite etc dialog if the file that we are receiving already exists. 

 		// It must be done before we create the connection or else the other party will begin sending packets while the user is still deciding if 

@@ -952,56 +958,57 @@ int CDccSession::SetupConnection()
 		// dwWhatNeedsDoing will be set using InterlockedExchange() (from other parts of the code depending on action) before SetEvent() is called.

 		// If the user has chosen rename then InterlockedExchange() will be used for setting NewFileName to a string containing the new name.

 		// Furthermore dwResumePos will be set using InterlockedExchange() to indicate what the file position to start from is.

-		if ( ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_FILERESUME, (void *)di, (LPARAM)&pfts)) { 

-			WaitForSingleObject( hEvent, INFINITE );

-			switch( dwWhatNeedsDoing ) {

+		if (ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_FILERESUME, (void *)di, (LPARAM)&pfts)) {

+			WaitForSingleObject(hEvent, INFINITE);

+			switch (dwWhatNeedsDoing) {

 			case FILERESUME_RENAME:

 				// If the user has chosen to rename the file we need to change variables accordingly. NewFileName has been set using

 				// InterlockedExchange()

-				if ( NewFileName) { // the user has chosen to rename the new incoming file.

+				if (NewFileName) { // the user has chosen to rename the new incoming file.

 					di->sFileAndPath = NewFileName;

 

-					int i = di->sFileAndPath.ReverseFind( '\\' );

-					if ( i != -1 ) {

-						di->sPath = di->sFileAndPath.Mid(0, i+1);

-						di->sFile = di->sFileAndPath.Mid(i+1, di->sFileAndPath.GetLength());

+					int i = di->sFileAndPath.ReverseFind('\\');

+					if (i != -1) {

+						di->sPath = di->sFileAndPath.Mid(0, i + 1);

+						di->sFile = di->sFileAndPath.Mid(i + 1, di->sFileAndPath.GetLength());

 					}

 

-					pfts.tszCurrentFile = ( TCHAR* )di->sFileAndPath.c_str();

-					pfts.tszWorkingDir =	( TCHAR* )di->sPath.c_str();

+					pfts.tszCurrentFile = (TCHAR*)di->sFileAndPath.c_str();

+					pfts.tszWorkingDir = (TCHAR*)di->sPath.c_str();

 					pfts.totalBytes = di->dwSize;

 					pfts.currentFileSize = pfts.totalBytes;

-					

+

 					delete[] NewFileName;

 					NewFileName = NULL;

 				}

 				break;

 

-			case FILERESUME_OVERWRITE:	

-			case FILERESUME_RESUME	:	

+			case FILERESUME_OVERWRITE:

+			case FILERESUME_RESUME:

 				// no action needed at this point, just break out of the switch statement

 				break;

 

-			case FILERESUME_CANCEL	:

-				return FALSE; 

+			case FILERESUME_CANCEL:

+				return FALSE;

 

-			case FILERESUME_SKIP	:

+			case FILERESUME_SKIP:

 			default:

 				delete this; // per usual dcc objects destroy themselves when they fail or when connection is closed

-				return FALSE; 

-		}	}			

+				return FALSE;

+			}

+		}

 

 		// hack for passive filetransfers

-		if ( di->iType == DCC_SEND && !di->bSender && di->bReverse ) {

-			NETLIBBIND nb = {0};

+		if (di->iType == DCC_SEND && !di->bSender && di->bReverse) {

+			NETLIBBIND nb = { 0 };

 			nb.cbSize = sizeof(NETLIBBIND);

 			nb.pfnNewConnectionV2 = DoIncomingDcc; // this is the (helper) function to be called once an incoming connection is made. The 'real' function that is called is IncomingConnection()

-			nb.pExtra = (void *)this; 

+			nb.pExtra = (void *)this;

 			nb.wPort = 0;

 			hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&nb);

 

-			if ( hBindPort == NULL ) {

-				m_proto->DoEvent(GC_EVENT_INFORMATION, 0, m_proto->m_info.sNick.c_str(), LPGENT("DCC ERROR: Unable to bind local port for passive filetransfer"), NULL, NULL, NULL, true, false); 

+			if (hBindPort == NULL) {

+				m_proto->DoEvent(GC_EVENT_INFORMATION, 0, m_proto->m_info.sNick.c_str(), LPGENT("DCC ERROR: Unable to bind local port for passive filetransfer"), NULL, NULL, NULL, true, false);

 				delete this; // dcc objects destroy themselves when the connection has been closed or failed for some reasson.

 				return 0;

 			}

@@ -1011,46 +1018,46 @@ int CDccSession::SetupConnection()
 			CMString sFileWithQuotes = di->sFile;

 

 			// if spaces in the filename surround with quotes

-			if ( sFileWithQuotes.Find( ' ', 0 ) != -1 ) {

-				sFileWithQuotes.Insert( 0, _T("\""));

-				sFileWithQuotes.Insert( sFileWithQuotes.GetLength(), _T("\""));

+			if (sFileWithQuotes.Find(' ', 0) != -1) {

+				sFileWithQuotes.Insert(0, _T("\""));

+				sFileWithQuotes.Insert(sFileWithQuotes.GetLength(), _T("\""));

 			}

 

 			// send out DCC RECV command for passive filetransfers

 			unsigned long ulAdr = 0;

-			if ( m_proto->m_manualHost )

-				ulAdr = ConvertIPToInteger( m_proto->m_mySpecifiedHostIP );				

+			if (m_proto->m_manualHost)

+				ulAdr = ConvertIPToInteger(m_proto->m_mySpecifiedHostIP);

 			else

-				ulAdr = m_proto->m_IPFromServer ? ConvertIPToInteger( m_proto->m_myHost ) : nb.dwExternalIP;

+				ulAdr = m_proto->m_IPFromServer ? ConvertIPToInteger(m_proto->m_myHost) : nb.dwExternalIP;

 

-			if ( di->iPort && ulAdr )

-				m_proto->PostIrcMessage( _T("/CTCP %s DCC SEND %s %u %u %I64u %s"), di->sContactName.c_str(), sFileWithQuotes.c_str(), ulAdr, di->iPort, di->dwSize, di->sToken.c_str());

+			if (di->iPort && ulAdr)

+				m_proto->PostIrcMessage(_T("/CTCP %s DCC SEND %s %u %u %I64u %s"), di->sContactName.c_str(), sFileWithQuotes.c_str(), ulAdr, di->iPort, di->dwSize, di->sToken.c_str());

 

-			return TRUE; 			

+			return TRUE;

 		}

 

 		// connect to the remote computer from which you are receiving the file (now all actions to take (resume/overwrite etc) have been decided

 		NETLIBOPENCONNECTION ncon = { 0 };

 		ncon.cbSize = sizeof(ncon);

 		ncon.szHost = ConvertIntegerToIP(di->dwAdr);

-		ncon.wPort = (WORD) di->iPort;

+		ncon.wPort = (WORD)di->iPort;

 

 		con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&ncon);

 	}

 

 	// if for some reason the plugin has failed to connect to the remote computer the object is destroyed.

-	if ( con == NULL ) {

+	if (con == NULL) {

 		delete this;

 		return FALSE; // failed to connect

 	}

 

 	// if it is a chat connection set the user to online now since we now know there is a connection

-	if ( di->iType == DCC_CHAT )

+	if (di->iType == DCC_CHAT)

 		m_proto->setWord(di->hContact, "Status", ID_STATUS_ONLINE);

 

 	// spawn a new thread to handle receiving/sending of data for the new chat/filetransfer connection to the remote computer

-	mir_forkthread( ThreadProc, this  );

-	

+	mir_forkthread(ThreadProc, this);

+

 	return con != NULL;

 }

 

@@ -1058,70 +1065,70 @@ int CDccSession::SetupConnection()
 int CDccSession::IncomingConnection(HANDLE hConnection, DWORD dwIP)

 {

 	con = hConnection;

-	if ( con == NULL ) {

+	if (con == NULL) {

 		delete this;

 		return false; // failed to connect

 	}

 

 	m_proto->setDword(di->hContact, "IP", dwIP); // mToolTip stuff

 

-	if ( di->iType == DCC_CHAT )

+	if (di->iType == DCC_CHAT)

 		m_proto->setWord(di->hContact, "Status", ID_STATUS_ONLINE); // set chat to online

 

 	// same as above, spawn a new thread to handle receiving/sending of data for the new incoming chat/filetransfer connection  

-	mir_forkthread(ThreadProc, this  );

+	mir_forkthread(ThreadProc, this);

 	return true;

 }

 

 // here we decide which function to use for communicating with the remote computer, depending on connection type

-void __cdecl CDccSession::ThreadProc(void *pparam) 

+void __cdecl CDccSession::ThreadProc(void *pparam)

 {

 	CDccSession* pThis = (CDccSession*)pparam;

 

 	// if it is an incoming connection on a listening port, then we should close the listenting port so only one can connect (the one you offered

 	// the connection to) can connect and not evil IRCopers with haxxored IRCDs

-	if ( pThis->hBindPort ) {

+	if (pThis->hBindPort) {

 		Netlib_CloseHandle(pThis->hBindPort);

 		pThis->hBindPort = NULL;

 	}

 

-	if ( pThis->di->iType == DCC_CHAT )

+	if (pThis->di->iType == DCC_CHAT)

 		pThis->DoChatReceive(); // dcc chat

 

-	else if ( !pThis->di->bSender )

+	else if (!pThis->di->bSender)

 		pThis->DoReceiveFile(); // receive a file

 

-	else if ( pThis->di->bSender )

+	else if (pThis->di->bSender)

 		pThis->DoSendFile(); // send a file

 }

 

 // this is done when the user is initiating a filetransfer to a remote computer

-void CDccSession::DoSendFile() 

+void CDccSession::DoSendFile()

 {

 	// initialize the filetransfer dialog

 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (void *)di, 0);

 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (void *)di, 0);

 

-	WORD wPacketSize = m_proto->getWord( "DCCPacketSize", 1024*4);

+	WORD wPacketSize = m_proto->getWord("DCCPacketSize", 1024 * 4);

 

-	if ( wPacketSize < 256 )

+	if (wPacketSize < 256)

 		wPacketSize = 256;

 

-	if ( wPacketSize > 32 * 1024 )

+	if (wPacketSize > 32 * 1024)

 		wPacketSize = 32 * 1024;

 

-	BYTE* chBuf = new BYTE[wPacketSize+1];

+	BYTE* chBuf = new BYTE[wPacketSize + 1];

 

 	// is there a connection?

-	if ( con ) {

+	if (con) {

 		// open the file for reading

-		int hFile = _topen( di->sFileAndPath.c_str(), _O_RDONLY | _O_BINARY, _S_IREAD);

-		if (hFile >= 0) {	

+		int hFile = _topen(di->sFileAndPath.c_str(), _O_RDONLY | _O_BINARY, _S_IREAD);

+		if (hFile >= 0) {

 			unsigned __int64 dwLastAck = 0;

 

 			// if the user has chosen to resume a file, dwResumePos will contain a value (set using InterlockedExchange())

 			// and then the variables and the file pointer are changed accordingly.

-			if ( dwResumePos && dwWhatNeedsDoing == FILERESUME_RESUME ) {

+			if (dwResumePos && dwWhatNeedsDoing == FILERESUME_RESUME) {

 				_lseeki64(hFile, dwResumePos, SEEK_SET);

 				dwTotal = dwResumePos;

 				dwLastAck = dwResumePos;

@@ -1130,96 +1137,97 @@ void CDccSession::DoSendFile()
 			}

 

 			// initial ack to set the 'percentage-ready meter' to the correct value

-			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM) &pfts);

-			

+			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM)&pfts);

+

 			tLastActivity = time(0);

 

 			// create a packet receiver to handle receiving ack's from the remote computer.

 			HANDLE hPackrcver = (HANDLE)CallService(MS_NETLIB_CREATEPACKETRECVER, (WPARAM)con, sizeof(DWORD));

 			NETLIBPACKETRECVER npr;

 			npr.cbSize = sizeof(NETLIBPACKETRECVER);

-			npr.dwTimeout = 60*1000;

-			npr.bufferSize = sizeof(DWORD); 

+			npr.dwTimeout = 60 * 1000;

+			npr.bufferSize = sizeof(DWORD);

 			npr.bytesUsed = 0;

 

 			// until the connection is dropped it will spin around in this while() loop

-			while ( con ) {

+			while (con) {

 				// read a packet

 				int iRead = _read(hFile, chBuf, wPacketSize);

-				if ( iRead <= 0 )

+				if (iRead <= 0)

 					break; // break out if everything has already been read

 

 				// send the package

 				int cbSent = NLSend((unsigned char*)chBuf, iRead);

-				if ( cbSent <= 0 )

+				if (cbSent <= 0)

 					break; // break out if connection is lost or a transmission error has occured

 

-				if ( !con )

+				if (!con)

 					break;

 

 				dwTotal += cbSent;

 

 				// block connection and receive ack's from remote computer (if applicable)

-				if ( m_proto->m_DCCMode == 0 ) {

+				if (m_proto->m_DCCMode == 0) {

 					DWORD dwRead = 0;

 					DWORD dwPacket = NULL;

 

-					do {					

+					do {

 						dwRead = CallService(MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);

-						npr.bytesUsed = sizeof(DWORD);          

+						npr.bytesUsed = sizeof(DWORD);

 

-						if ( dwRead <= 0)

+						if (dwRead <= 0)

 							break; // connection closed, or a timeout occurred.

 

-						dwPacket  = *(DWORD*)npr.buffer;

+						dwPacket = *(DWORD*)npr.buffer;

 						dwLastAck = ntohl(dwPacket);

 

 					}

-						while(con && dwTotal != dwLastAck);

+					while (con && dwTotal != dwLastAck);

 

-					if ( !con || dwRead <= 0 )

+					if (!con || dwRead <= 0)

 						goto DCC_STOP;

 				}

 

-				if ( m_proto->m_DCCMode == 1 ) {

+				if (m_proto->m_DCCMode == 1) {

 					DWORD dwRead = 0;

 					DWORD dwPacket = 0;

 

-					do {					

+					do {

 						dwRead = CallService(MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);

-						npr.bytesUsed = sizeof(DWORD);          

-						if ( dwRead <= 0)

+						npr.bytesUsed = sizeof(DWORD);

+						if (dwRead <= 0)

 							break; // connection closed, or a timeout occurred.

 

-						dwPacket =  *(DWORD*)npr.buffer;

+						dwPacket = *(DWORD*)npr.buffer;

 						dwLastAck = ntohl(dwPacket);

 					}

-						while(con && (di->dwSize != dwTotal

-						&& dwTotal - dwLastAck >= 100*1024

-						|| di->dwSize == dwTotal // get the last packets when the whole file has been sent

-						&& dwTotal != dwLastAck));

+					while (con && (di->dwSize != dwTotal

+					&& dwTotal - dwLastAck >= 100 * 1024

+					|| di->dwSize == dwTotal // get the last packets when the whole file has been sent

+					&& dwTotal != dwLastAck));

 

-					if ( !con || dwRead <= 0 )

+					if (!con || dwRead <= 0)

 						goto DCC_STOP;

-				}				

+				}

 

 				// update the filetransfer dialog's 'percentage-ready meter' once per second only to save cpu

-				if ( tLastPercentageUpdate < time(0)) {

+				if (tLastPercentageUpdate < time(0)) {

 					tLastPercentageUpdate = time(0);

 					pfts.totalProgress = dwTotal;

 					pfts.currentFileProgress = dwTotal;

-					ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM) &pfts);

+					ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM)&pfts);

 				}

 

 				// close the connection once the whole file has been sent an completely ack'ed

-				if ( dwLastAck >= di->dwSize ) {

+				if (dwLastAck >= di->dwSize) {

 					Netlib_CloseHandle(con);

 					con = NULL;

-			}	}

+				}

+			}

 

-DCC_STOP:

+		DCC_STOP:

 			// need to close the connection if it isn't allready

-			if ( con ) {

+			if (con) {

 				Netlib_CloseHandle(con);

 				con = NULL;

 			}

@@ -1228,43 +1236,44 @@ DCC_STOP:
 			tLastActivity = time(0);

 			pfts.totalProgress = dwTotal;

 			pfts.currentFileProgress = dwTotal;

-			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM) &pfts);

+			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM)&pfts);

 

 			_close(hFile);

 		}

-		else // file was not possible to open for reading

-		{

+		else { // file was not possible to open for reading

 			ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, (void *)di, 0);

-			if ( con ) {

+			if (con) {

 				Netlib_CloseHandle(con);

 				con = NULL;

-	}	}	}

+			}

+		}

+	}

 

-	delete []chBuf;

+	delete[]chBuf;

 	delete this; // ... and hopefully all went right, cuz here the object is deleted in any case

 }

 

 // This is called when receiving a file from a remote computer.

-void CDccSession::DoReceiveFile() 

+void CDccSession::DoReceiveFile()

 {

 	// initialize the filetransfer dialog

-	ProtoBroadcastAck( m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (void *)di, 0);

+	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (void *)di, 0);

 

-	BYTE chBuf[1024*32+1];

+	BYTE chBuf[1024 * 32 + 1];

 

 	// do some stupid thing so  the filetransfer dialog shows the right thing

 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (void *)di, 0);

 

 	// open the file for writing (and reading in case it is a resume)

-	int hFile = _topen( di->sFileAndPath.c_str(), 

-		(dwWhatNeedsDoing == FILERESUME_RESUME ? _O_APPEND : _O_TRUNC | _O_CREAT) | _O_RDWR | _O_BINARY, 

+	int hFile = _topen(di->sFileAndPath.c_str(),

+		(dwWhatNeedsDoing == FILERESUME_RESUME ? _O_APPEND : _O_TRUNC | _O_CREAT) | _O_RDWR | _O_BINARY,

 		_S_IREAD | _S_IWRITE);

-	if ( hFile >= 0 ) {	

+	if (hFile >= 0) {

 		unsigned __int64 dwLastAck = 0;

 

 		// dwResumePos and dwWhatNeedsDoing has possibly been set using InterlockedExchange()

 		// if set it is a resume and we adjust variables and the file pointer accordingly.

-		if ( dwResumePos && dwWhatNeedsDoing == FILERESUME_RESUME ) {

+		if (dwResumePos && dwWhatNeedsDoing == FILERESUME_RESUME) {

 			_lseeki64(hFile, dwResumePos, SEEK_SET);

 			dwTotal = dwResumePos;

 			dwLastAck = dwResumePos;

@@ -1273,15 +1282,15 @@ void CDccSession::DoReceiveFile()
 		}

 

 		// send an initial ack for the percentage-ready meter

-		ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM) &pfts);

-		

+		ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM)&pfts);

+

 		// the while loop will spin around till the connection is dropped, locally or by the remote computer.

-		while ( con ) {

+		while (con) {

 			// read

 			int cbRead = NLReceive((unsigned char*)chBuf, sizeof(chBuf));

-			if ( cbRead <= 0 )

+			if (cbRead <= 0)

 				break;

-			

+

 			// write it to the file

 			_write(hFile, chBuf, cbRead);

 

@@ -1289,7 +1298,7 @@ void CDccSession::DoReceiveFile()
 

 			// this snippet sends out an ack for every 4 kb received in send ahead

 			// or every packet for normal mode

-			if ( !di->bTurbo ) {

+			if (!di->bTurbo) {

 				DWORD no = dwTotal;

 				no = htonl(no);

 				NLSend((unsigned char *)&no, sizeof(DWORD));

@@ -1299,31 +1308,33 @@ void CDccSession::DoReceiveFile()
 

 			// sets the 'last update time' to check for timed out connections, and also make sure we only

 			// ack the 'percentage-ready meter' only once a second to save CPU.

-			if ( tLastPercentageUpdate < time( 0 )) {

-				tLastPercentageUpdate = time (0);

+			if (tLastPercentageUpdate < time(0)) {

+				tLastPercentageUpdate = time(0);

 				pfts.totalProgress = dwTotal;

 				pfts.currentFileProgress = dwTotal;

-				ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM) &pfts);

-			}	

-			

+				ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM)&pfts);

+			}

+

 			// if file size is known and everything is received then disconnect 

-			if ( di->dwSize && di->dwSize == dwTotal ) {

+			if (di->dwSize && di->dwSize == dwTotal) {

 				Netlib_CloseHandle(con);

 				con = NULL;

-		}	}

+			}

+		}

 		// receiving loop broken locally or by remote computer, just some cleaning up left....

-		

+

 		pfts.totalProgress = dwTotal;

 		pfts.currentFileProgress = dwTotal;

-		ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM) &pfts);

+		ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (void *)di, (LPARAM)&pfts);

 		_close(hFile);

 	}

-	else  {

+	else {

 		ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, (void *)di, 0);

-		if ( con ) { // file not possible to open for writing so we ack FAILURE and close the handle

+		if (con) { // file not possible to open for writing so we ack FAILURE and close the handle

 			Netlib_CloseHandle(con);

 			con = NULL;

-	}	}

+		}

+	}

 

 	delete this; // and finally the object is deleted

 }

@@ -1334,52 +1345,52 @@ void CDccSession::DoReceiveFile()
 

 void CDccSession::DoChatReceive()

 {

-	char chBuf[1024*4+1]; 

+	char chBuf[1024 * 4 + 1];

 	int cbInBuf = 0;

-	

+

 	// loop to spin around while there is a connection

-	while( con ) {

+	while (con) {

 		int cbRead;

 		int nLinesProcessed = 0;

-		

-		cbRead = NLReceive((unsigned char*)chBuf+cbInBuf, sizeof(chBuf)-cbInBuf-1);

-		if ( cbRead <= 0 )

+

+		cbRead = NLReceive((unsigned char*)chBuf + cbInBuf, sizeof(chBuf)-cbInBuf - 1);

+		if (cbRead <= 0)

 			break;

 

 		cbInBuf += cbRead;

 		chBuf[cbInBuf] = '\0';

-		

+

 		char* pStart = chBuf;

-		while( *pStart ) {

+		while (*pStart) {

 			char* pEnd;

-			

+

 			// seek end-of-line

-			for(pEnd=pStart; *pEnd && *pEnd != '\r' && *pEnd != '\n'; ++pEnd)

+			for (pEnd = pStart; *pEnd && *pEnd != '\r' && *pEnd != '\n'; ++pEnd)

 				;

-			if ( *pEnd == '\0' )

+			if (*pEnd == '\0')

 				break; // uncomplete message. stop parsing.

-			

+

 			++nLinesProcessed;

-			

+

 			// replace end-of-line with NULLs and skip

-			while( *pEnd == '\r' || *pEnd == '\n' )

+			while (*pEnd == '\r' || *pEnd == '\n')

 				*pEnd++ = '\0';

-			

-			if ( *pStart ) {

+

+			if (*pStart) {

 				// send it off to some messaging module

-				PROTORECVEVENT pre = {0};

+				PROTORECVEVENT pre = { 0 };

 				pre.timestamp = (DWORD)time(NULL);

 				pre.szMessage = pStart;

 				ProtoChainRecvMsg(di->hContact, &pre);

 			}

-			

+

 			cbInBuf -= pEnd - pStart;

 			pStart = pEnd;

 		}

-		

+

 		// discard processed messages

-		if ( nLinesProcessed != 0 )

-			memmove(chBuf, pStart, cbInBuf+1);

+		if (nLinesProcessed != 0)

+			memmove(chBuf, pStart, cbInBuf + 1);

 	}

 

 	delete this; // delete the object when the connection is dropped

@@ -1388,14 +1399,14 @@ void CDccSession::DoChatReceive()
 // disconnect the stuff

 int CDccSession::Disconnect()

 {

-	if ( hBindPort ) {

+	if (hBindPort) {

 		Netlib_CloseHandle(hBindPort);

 		hBindPort = NULL;

 	}

 

 	// if 'con' exists it is cuz a connection exists. 

 	// Terminating 'con' will cause any spawned threads to die and then the object will destroy itself.

-	if ( con ) {

+	if (con) {

 		Netlib_CloseHandle(con);

 		con = NULL;

 	}

@@ -1407,10 +1418,10 @@ int CDccSession::Disconnect()
 ////////////////////////////////////////////////////////////////////

 // check if the dcc chats should disconnect ( default 5 minute timeout )

 

-VOID CALLBACK DCCTimerProc( HWND, UINT, UINT_PTR idEvent, DWORD )

+VOID CALLBACK DCCTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD)

 {

-	CIrcProto *ppro = GetTimerOwner( idEvent );

-	if ( ppro )

+	CIrcProto *ppro = GetTimerOwner(idEvent);

+	if (ppro)

 		ppro->CheckDCCTimeout();

 }

 

@@ -1423,55 +1434,52 @@ void DoIncomingDcc(HANDLE hConnection, DWORD dwRemoteIP, void * p1)
 

 // ident server

 

-void strdel( char* parBuffer, int len )

+void strdel(char* parBuffer, int len)

 {

-	char* p;

-	for ( p = parBuffer+len; *p != 0; p++ )

-		p[ -len ] = *p;

+	char *p;

+	for (p = parBuffer + len; *p != 0; p++)

+		p[-len] = *p;

 

-	p[ -len ] = '\0';

+	p[-len] = '\0';

 }

 

-void DoIdent(HANDLE hConnection, DWORD, void* extra )

+void DoIdent(HANDLE hConnection, DWORD, void* extra)

 {

-	CIrcProto *ppro = ( CIrcProto* )extra;

+	CIrcProto *ppro = (CIrcProto*)extra;

 

 	char szBuf[1024];

 	int cbTotal = 0;

 

-	for (;;) {

-		int cbRead = Netlib_Recv(hConnection, szBuf+cbTotal, sizeof(szBuf)-1-cbTotal, 0);

-		if ( cbRead == SOCKET_ERROR || cbRead == 0)

+	while (true) {

+		int cbRead = Netlib_Recv(hConnection, szBuf + cbTotal, sizeof(szBuf)-1 - cbTotal, 0);

+		if (cbRead == SOCKET_ERROR || cbRead == 0)

 			break;

 

 		cbTotal += cbRead;

 		szBuf[cbTotal] = '\0';

-		

+

 LBL_Parse:

 		char* EOLPos = strstr(szBuf, "\r\n");

 		if (EOLPos == NULL)

 			continue;

 

 		EOLPos[0] = EOLPos[1] = '\0';

-		rtrim( szBuf );

+		rtrim(szBuf);

 		ppro->debugLogA("Got Ident request: %s", szBuf);

 

 		unsigned int PeerPortNrRcvd = 0, LocalPortNrRcvd = 0;

-		int iParamCnt = sscanf( szBuf, "%d , %d", &LocalPortNrRcvd, &PeerPortNrRcvd );

+		int iParamCnt = sscanf(szBuf, "%d , %d", &LocalPortNrRcvd, &PeerPortNrRcvd);

 

 		int cbLen = 0;

-		char buf[1024*4];

+		char buf[1024 * 4];

 

 		if (iParamCnt != 2)

 			cbLen = mir_snprintf(buf, SIZEOF(buf), "%s : ERROR : UNKNOWN-ERROR\r\n", szBuf);

-		else 

-		{

-			for (int i = 0; i < g_Instances.getCount(); i++) 

-			{

-				if (PeerPortNrRcvd == g_Instances[i]->m_info.iPort && LocalPortNrRcvd == g_Instances[i]->m_myLocalPort) 

-				{

-					cbLen = mir_snprintf(buf, SIZEOF(buf), "%s : USERID : %S : %S\r\n", 

-						szBuf, g_Instances[i]->m_info.sIdentServerType.c_str() , g_Instances[i]->m_info.sUserID.c_str());

+		else {

+			for (int i = 0; i < g_Instances.getCount(); i++) {

+				if (PeerPortNrRcvd == g_Instances[i]->m_info.iPort && LocalPortNrRcvd == g_Instances[i]->m_myLocalPort) {

+					cbLen = mir_snprintf(buf, SIZEOF(buf), "%s : USERID : %S : %S\r\n",

+						szBuf, g_Instances[i]->m_info.sIdentServerType.c_str(), g_Instances[i]->m_info.sUserID.c_str());

 					break;

 				}

 			}

@@ -1480,12 +1488,12 @@ LBL_Parse:
 				cbLen = mir_snprintf(buf, SIZEOF(buf), "%s : ERROR : INVALID-PORT\r\n", szBuf);

 		}

 

-		if ( Netlib_Send(hConnection, (const char*)buf, cbLen, 0) > 0)

+		if (Netlib_Send(hConnection, (const char*)buf, cbLen, 0) > 0)

 			ppro->debugLogA("Sent Ident answer: %s", buf);

 		else

 			ppro->debugLogA("Sending Ident answer failed.");

-		

-		if ( ppro->m_identTimer )

+

+		if (ppro->m_identTimer)

 			break;

 

 		cbTotal -= EOLPos + 2 - szBuf;