bye-bye old coding style in Jabber

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

1 files changed, 22 insertions, 22 deletions

diff --git a/protocols/JabberG/src/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp
index 494dcf3454..b9b7ecd4bd 100644
--- a/protocols/JabberG/src/jabber_ws.cpp
+++ b/protocols/JabberG/src/jabber_ws.cpp
@@ -1,13 +1,13 @@
 /*

 

 Jabber Protocol Plugin for Miranda IM

-Copyright ( C ) 2002-04  Santithorn Bunchua

-Copyright ( C ) 2005-12  George Hazan

+Copyright (C) 2002-04  Santithorn Bunchua

+Copyright (C) 2005-12  George Hazan

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

 as published by the Free Software Foundation; either version 2

-of the License, or ( at your option ) any later version.

+of the License, or (at your option) any later version.

 

 This program is distributed in the hope that it will be useful,

 but WITHOUT ANY WARRANTY; without even the implied warranty of

@@ -22,68 +22,68 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "jabber.h"

 

-BOOL CJabberProto::WsInit( void )

+BOOL CJabberProto::WsInit(void)

 {

 	m_lastTicks = ::GetTickCount();

 

 	TCHAR name[128];

-	mir_sntprintf( name, SIZEOF(name), TranslateT("%s connection"), m_tszUserName);

+	mir_sntprintf(name, SIZEOF(name), TranslateT("%s connection"), m_tszUserName);

 

 	NETLIBUSER nlu = {0};

-	nlu.cbSize = sizeof( nlu );

+	nlu.cbSize = sizeof(nlu);

 	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR;	// | NUF_HTTPGATEWAY;

 	nlu.ptszDescriptiveName = name;

 	nlu.szSettingsModule = m_szModuleName;

 	//nlu.szHttpGatewayHello = "http://http.proxy.icq.com/hello";

-	//nlu.szHttpGatewayUserAgent = "Mozilla/4.08 [en] ( WinNT; U ;Nav )";

+	//nlu.szHttpGatewayUserAgent = "Mozilla/4.08 [en] (WinNT; U ;Nav)";

 	//nlu.pfnHttpGatewayInit = JabberHttpGatewayInit;

 	//nlu.pfnHttpGatewayBegin = JabberHttpGatewayBegin;

 	//nlu.pfnHttpGatewayWrapSend = JabberHttpGatewayWrapSend;

 	//nlu.pfnHttpGatewayUnwrapRecv = JabberHttpGatewayUnwrapRecv;

-	m_hNetlibUser = ( HANDLE ) CallService( MS_NETLIB_REGISTERUSER, 0, ( LPARAM )&nlu );

+	m_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

 

 	return m_hNetlibUser != NULL;

 }

 

-void CJabberProto::WsUninit( void )

+void CJabberProto::WsUninit(void)

 {

-	Netlib_CloseHandle( m_hNetlibUser );

+	Netlib_CloseHandle(m_hNetlibUser);

 	m_hNetlibUser = NULL;

 }

 

-JABBER_SOCKET CJabberProto::WsConnect( char* host, WORD port )

+JABBER_SOCKET CJabberProto::WsConnect(char* host, WORD port)

 {

 	NETLIBOPENCONNECTION nloc = { 0 };

-	nloc.cbSize = sizeof( nloc );

+	nloc.cbSize = sizeof(nloc);

 	nloc.szHost = host;

 	nloc.wPort = port;

 	nloc.timeout = 6;

-	return ( HANDLE )CallService( MS_NETLIB_OPENCONNECTION, ( WPARAM ) m_hNetlibUser, ( LPARAM )&nloc );

+	return (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_hNetlibUser, (LPARAM)&nloc);

 }

 

-int CJabberProto::WsSend( JABBER_SOCKET hConn, char* data, int datalen, int flags )

+int CJabberProto::WsSend(JABBER_SOCKET hConn, char* data, int datalen, int flags)

 {

 	m_lastTicks = ::GetTickCount();

 	int len;

 

-	if (( len = Netlib_Send( hConn, data, datalen, flags )) == SOCKET_ERROR || len != datalen ) {

-		Log( "Netlib_Send() failed, error=%d", WSAGetLastError());

+	if ((len = Netlib_Send(hConn, data, datalen, flags)) == SOCKET_ERROR || len != datalen) {

+		Log("Netlib_Send() failed, error=%d", WSAGetLastError());

 		return SOCKET_ERROR;

 	}

 	return len;

 }

 

-int CJabberProto::WsRecv( JABBER_SOCKET hConn, char* data, long datalen, int flags )

+int CJabberProto::WsRecv(JABBER_SOCKET hConn, char* data, long datalen, int flags)

 {

 	int ret;

 

-	ret = Netlib_Recv( hConn, data, datalen, flags );

-	if ( ret == SOCKET_ERROR ) {

-		Log( "Netlib_Recv() failed, error=%d", WSAGetLastError());

+	ret = Netlib_Recv(hConn, data, datalen, flags);

+	if (ret == SOCKET_ERROR) {

+		Log("Netlib_Recv() failed, error=%d", WSAGetLastError());

 		return 0;

 	}

-	if ( ret == 0 ) {

-		Log( "Connection closed gracefully" );

+	if (ret == 0) {

+		Log("Connection closed gracefully");

 		return 0;

 	}

 	return ret;