massive name conflict resolution

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

1 files changed, 139 insertions, 169 deletions

diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp
index d66e920b56..0a774fbf5b 100644
--- a/protocols/AimOscar/src/utility.cpp
+++ b/protocols/AimOscar/src/utility.cpp
@@ -21,88 +21,79 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 void CAimProto::broadcast_status(int status)

 {

-	debugLogA("Broadcast Status: %d",status);

+	debugLogA("Broadcast Status: %d", status);

 	int old_status = m_iStatus;

 	m_iStatus = status;

-	if (m_iStatus == ID_STATUS_OFFLINE)

-	{

+	if (m_iStatus == ID_STATUS_OFFLINE) {

 		shutdown_file_transfers();

 		shutdown_chat_conn();

 

-		if (hServerConn)

-		{

-			aim_sendflap(hServerConn,0x04,0,NULL,seqno);

-			Netlib_Shutdown(hServerConn);

+		if (m_hServerConn) {

+			aim_sendflap(m_hServerConn, 0x04, 0, NULL, m_seqno);

+			Netlib_Shutdown(m_hServerConn);

 		}

 

-		if (hMailConn && hMailConn != (HANDLE)1)

-		{

-			aim_sendflap(hMailConn,0x04,0,NULL,mail_seqno);

-			Netlib_Shutdown(hMailConn);

+		if (m_hMailConn && m_hMailConn != (HANDLE)1) {

+			aim_sendflap(m_hMailConn, 0x04, 0, NULL, m_mail_seqno);

+			Netlib_Shutdown(m_hMailConn);

 		}

-		else if (hMailConn == (HANDLE)1)

-			hMailConn = NULL;

+		else if (m_hMailConn == (HANDLE)1)

+			m_hMailConn = NULL;

 

-		if (hAvatarConn && hAvatarConn != (HANDLE)1)

-		{

-			aim_sendflap(hAvatarConn,0x04,0,NULL,avatar_seqno);

-			Netlib_Shutdown(hAvatarConn);

+		if (m_hAvatarConn && m_hAvatarConn != (HANDLE)1) {

+			aim_sendflap(m_hAvatarConn, 0x04, 0, NULL, m_avatar_seqno);

+			Netlib_Shutdown(m_hAvatarConn);

 		}

-		else if (hAvatarConn == (HANDLE)1)

-			hAvatarConn = NULL;

+		else if (m_hAvatarConn == (HANDLE)1)

+			m_hAvatarConn = NULL;

 

-		if (hChatNavConn && hChatNavConn != (HANDLE)1)

-		{

-			aim_sendflap(hChatNavConn,0x04,0,NULL,chatnav_seqno);

-			Netlib_Shutdown(hChatNavConn);

+		if (m_hChatNavConn && m_hChatNavConn != (HANDLE)1) {

+			aim_sendflap(m_hChatNavConn, 0x04, 0, NULL, m_chatnav_seqno);

+			Netlib_Shutdown(m_hChatNavConn);

 		}

-		else if (hChatNavConn == (HANDLE)1)

-			hChatNavConn = NULL;

+		else if (m_hChatNavConn == (HANDLE)1)

+			m_hChatNavConn = NULL;

 

-		idle = false;

-		instantidle = false;

-		list_received = false;

-		state = 0;

+		m_idle = false;

+		m_instantidle = false;

+		m_list_received = false;

+		m_state = 0;

 		m_iDesiredStatus = ID_STATUS_OFFLINE;

-		mir_free(last_status_msg); last_status_msg = NULL;

-		

-		avatar_id_lg = 0;

-		avatar_id_sm = 0;

-		mir_free(hash_lg); hash_lg = NULL;

-		mir_free(hash_sm); hash_sm = NULL;

-

-		pd_flags = 0;

-		pd_info_id = 0;

-		pd_mode = 0;

-

-		seqno = 0;

-		mail_seqno = 0;

-		avatar_seqno = 0;

-		chatnav_seqno = 0;

-		admin_seqno = 0;

-

+		replaceStr(m_last_status_msg, NULL);

+

+		m_avatar_id_lg = 0;

+		m_avatar_id_sm = 0;

+		replaceStr(m_hash_lg, NULL);

+		replaceStr(m_hash_sm, NULL);

+

+		m_pd_flags = 0;

+		m_pd_info_id = 0;

+		m_pd_mode = 0;

+

+		m_seqno = 0;

+		m_mail_seqno = 0;

+		m_avatar_seqno = 0;

+		m_chatnav_seqno = 0;

+		m_admin_seqno = 0;

 	}

-	ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);	

+	ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);

 }

 

 void CAimProto::start_connection(void*)

 {

-	if (m_iStatus<=ID_STATUS_OFFLINE)

-	{

+	if (m_iStatus <= ID_STATUS_OFFLINE) {

 		offline_contacts();

 		DBVARIANT dbv;

 		if (!getString(AIM_KEY_SN, &dbv))

 			db_free(&dbv);

-		else

-		{

+		else {

 			ShowPopup(LPGEN("Please, enter a username in the options dialog."), 0);

 			broadcast_status(ID_STATUS_OFFLINE);

 			return;

 		}

 		if (!getString(AIM_KEY_PW, &dbv))

 			db_free(&dbv);

-		else

-		{

+		else {

 			ShowPopup(LPGEN("Please, enter a password in the options dialog."), 0);

 			broadcast_status(ID_STATUS_OFFLINE);

 			return;

@@ -113,39 +104,39 @@ void CAimProto::start_connection(void*)
 		char* login_url = getStringA(AIM_KEY_HN);

 		if (login_url == NULL) login_url = mir_strdup(use_ssl ? AIM_DEFAULT_SERVER : AIM_DEFAULT_SERVER_NS);

 

-		hServerConn = aim_connect(login_url, get_default_port(), use_ssl, login_url);

+		m_hServerConn = aim_connect(login_url, get_default_port(), use_ssl, login_url);

 

 		mir_free(login_url);

 

-		pref1_flags = 0x77ffff;

-		pref1_set_flags = 0x77ffff;

-		mir_free(pref2_flags); pref2_flags = NULL; pref2_len = 0;

-		mir_free(pref2_set_flags); pref2_set_flags = NULL; pref2_set_len = 0;

+		m_pref1_flags = 0x77ffff;

+		m_pref1_set_flags = 0x77ffff;

+		mir_free(m_pref2_flags); m_pref2_flags = NULL; m_pref2_len = 0;

+		mir_free(m_pref2_set_flags); m_pref2_set_flags = NULL; m_pref2_set_len = 0;

 

-		if (hServerConn)

+		if (m_hServerConn)

 			aim_connection_authorization();

-		else 

+		else

 			broadcast_status(ID_STATUS_OFFLINE);

 	}

 }

 

 bool CAimProto::wait_conn(HANDLE& hConn, HANDLE& hEvent, unsigned short service)

 {

-	if (m_iStatus == ID_STATUS_OFFLINE) 

+	if (m_iStatus == ID_STATUS_OFFLINE)

 		return false;

 	{

 		mir_cslock lck(connMutex);

-		if (hConn == NULL && hServerConn) {

+		if (hConn == NULL && m_hServerConn) {

 			debugLogA("Starting Connection.");

 			hConn = (HANDLE)1;    //set so no additional service request attempts are made while aim is still processing the request

-			aim_new_service_request(hServerConn, seqno, service);//general service connection!

+			aim_new_service_request(m_hServerConn, m_seqno, service);//general service connection!

 		}

 	}

 

 	if (WaitForSingleObjectEx(hEvent, 10000, TRUE) != WAIT_OBJECT_0)

 		return false;

 

-	if (Miranda_Terminated() || m_iStatus == ID_STATUS_OFFLINE) 

+	if (Miranda_Terminated() || m_iStatus == ID_STATUS_OFFLINE)

 		return false;

 

 	return true;

@@ -168,10 +159,10 @@ MCONTACT CAimProto::find_chat_contact(const char* room)
 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

 		DBVARIANT dbv;

 		if (!getString(hContact, "ChatRoomID", &dbv)) {

-			bool found = !mir_strcmp(room, dbv.pszVal); 

+			bool found = !mir_strcmp(room, dbv.pszVal);

 			db_free(&dbv);

 			if (found)

-				return hContact; 

+				return hContact;

 		}

 	}

 	return NULL;

@@ -179,15 +170,15 @@ MCONTACT CAimProto::find_chat_contact(const char* room)
 

 MCONTACT CAimProto::contact_from_sn(const char* sn, bool addIfNeeded, bool temporary)

 {

-	ptrA norm_sn( normalize_name(sn));

+	ptrA norm_sn(normalize_name(sn));

 

 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

 		DBVARIANT dbv;

 		if (!getString(hContact, AIM_KEY_SN, &dbv)) {

-			bool found = !mir_strcmp(norm_sn, dbv.pszVal); 

+			bool found = !mir_strcmp(norm_sn, dbv.pszVal);

 			db_free(&dbv);

 			if (found)

-				return hContact; 

+				return hContact;

 		}

 	}

 

@@ -197,7 +188,7 @@ MCONTACT CAimProto::contact_from_sn(const char* sn, bool addIfNeeded, bool tempo
 			if (Proto_AddToContact(hContact, m_szModuleName) == 0) {

 				setString(hContact, AIM_KEY_SN, norm_sn);

 				setString(hContact, AIM_KEY_NK, sn);

-				debugLogA("Adding contact %s to client side list.",norm_sn);

+				debugLogA("Adding contact %s to client side list.", norm_sn);

 				if (temporary)

 					db_set_b(hContact, "CList", "NotOnList", 1);

 				return hContact;

@@ -216,16 +207,15 @@ void CAimProto::update_server_group(const char* group, unsigned short group_id)
 

 	if (group_id)

 		user_id_array = get_members_of_group(group_id, user_id_array_size);

-	else

-	{

-		user_id_array_size = (unsigned short)group_list.getCount();

+	else {

+		user_id_array_size = (unsigned short)m_group_list.getCount();

 		user_id_array = (unsigned short*)mir_alloc(user_id_array_size * sizeof(unsigned short));

-		for (unsigned short i=0; i<user_id_array_size; ++i)

-			user_id_array[i] = _htons(group_list[i].item_id);

+		for (unsigned short i = 0; i < user_id_array_size; ++i)

+			user_id_array[i] = _htons(m_group_list[i].item_id);

 	}

 

-	debugLogA("Modifying group %s:%u on the serverside list",group, group_id);

-	aim_mod_group(hServerConn, seqno, group, group_id, (char*)user_id_array, 

+	debugLogA("Modifying group %s:%u on the serverside list", group, group_id);

+	aim_mod_group(m_hServerConn, m_seqno, group, group_id, (char*)user_id_array,

 		user_id_array_size * sizeof(unsigned short));

 

 	mir_free(user_id_array);

@@ -236,16 +226,14 @@ void CAimProto::add_contact_to_group(MCONTACT hContact, const char* new_group)
 	if (new_group == NULL)

 		return;

 

-	unsigned short old_group_id = getGroupId(hContact, 1);	

-	char* old_group = group_list.find_name(old_group_id);

-

+	unsigned short old_group_id = getGroupId(hContact, 1);

+	char *old_group = m_group_list.find_name(old_group_id);

 	if (old_group && mir_strcmp(new_group, old_group) == 0)

 		return;

-   

+

 	DBVARIANT dbv;

 	char *nick = NULL;

-	if (!db_get_utf(hContact, MOD_KEY_CL, "MyHandle", &dbv))

-	{

+	if (!db_get_utf(hContact, MOD_KEY_CL, "MyHandle", &dbv)) {

 		nick = NEWSTR_ALLOCA(dbv.pszVal);

 		db_free(&dbv);

 	}

@@ -254,7 +242,7 @@ void CAimProto::add_contact_to_group(MCONTACT hContact, const char* new_group)
 

 	unsigned short item_id = getBuddyId(hContact, 1);

 	unsigned short new_item_id = search_for_free_item_id(hContact);

-	unsigned short new_group_id = group_list.find_id(new_group);

+	unsigned short new_group_id = m_group_list.find_id(new_group);

 

 	if (!item_id)

 		debugLogA("Contact %u not on list.", hContact);

@@ -265,43 +253,39 @@ void CAimProto::add_contact_to_group(MCONTACT hContact, const char* new_group)
 	else

 		db_unset(hContact, MOD_KEY_CL, OTH_KEY_GP);

 

-	aim_ssi_update(hServerConn, seqno, true);

-		

-	if (new_group_id == 0)

-	{

-		create_group(new_group);	

+	aim_ssi_update(m_hServerConn, m_seqno, true);

+

+	if (new_group_id == 0) {

+		create_group(new_group);

 		debugLogA("Group %s not on list.", new_group);

-		new_group_id = group_list.add(new_group);

+		new_group_id = m_group_list.add(new_group);

 		debugLogA("Adding group %s:%u to the serverside list", new_group, new_group_id);

-		aim_add_contact(hServerConn, seqno, new_group, 0, new_group_id, 1);//add the group server-side even if it exist

+		aim_add_contact(m_hServerConn, m_seqno, new_group, 0, new_group_id, 1);//add the group server-side even if it exist

 	}

 

 	debugLogA("Adding buddy %s:%u %s:%u to the serverside list", dbv.pszVal, new_item_id, new_group, new_group_id);

-	aim_add_contact(hServerConn, seqno, dbv.pszVal, new_item_id, new_group_id, 0, nick);

-	

+	aim_add_contact(m_hServerConn, m_seqno, dbv.pszVal, new_item_id, new_group_id, 0, nick);

+

 	update_server_group(new_group, new_group_id);

 

-	if (old_group_id && item_id)

-	{

+	if (old_group_id && item_id) {

 		bool is_not_in_list = getBool(hContact, AIM_KEY_NIL, false);

 		debugLogA("Removing buddy %s:%u %s:%u from the serverside list", dbv.pszVal, item_id, old_group, old_group_id);

-		aim_delete_contact(hServerConn, seqno, dbv.pszVal, item_id, old_group_id, 0, is_not_in_list);

+		aim_delete_contact(m_hServerConn, m_seqno, dbv.pszVal, item_id, old_group_id, 0, is_not_in_list);

 		update_server_group(old_group, old_group_id);

 		delSetting(hContact, AIM_KEY_NIL);

 	}

 

-	aim_ssi_update(hServerConn, seqno, false);

+	aim_ssi_update(m_hServerConn, m_seqno, false);

 

 	db_free(&dbv);

 }

 

 void CAimProto::offline_contact(MCONTACT hContact, bool remove_settings)

 {

-	if (remove_settings)

-	{

+	if (remove_settings) {

 		//We need some of this stuff if we are still online.

-		for(int i=1;;++i)

-		{

+		for (int i = 1;; ++i) {

 			if (deleteBuddyId(hContact, i)) break;

 			deleteGroupId(hContact, i);

 		}

@@ -314,50 +298,49 @@ void CAimProto::offline_contact(MCONTACT hContact, bool remove_settings)
 void CAimProto::offline_contacts(void)

 {

 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))

-		offline_contact(hContact,true);

+		offline_contact(hContact, true);

 

-	allow_list.destroy();

-	block_list.destroy();

-	group_list.destroy();

+	m_allow_list.destroy();

+	m_block_list.destroy();

+	m_group_list.destroy();

 }

 

 char *normalize_name(const char *s)

 {

 	if (s == NULL) return NULL;

-	

+

 	char* buf = mir_strdup(s);

 	_strlwr(buf);

-/*

-	char *p = strchr(buf, ' '); 

-	if (p)

-	{

-		char *q = p;

-		while (*p)

+	/*

+		char *p = strchr(buf, ' ');

+		if (p)

 		{

-			if (*p != ' ') *(q++) = *p;

-			++p;

+			char *q = p;

+			while (*p)

+			{

+				if (*p != ' ') *(q++) = *p;

+				++p;

+			}

+			*q = '\0';

 		}

-		*q = '\0';

-	}

-*/

+	*/

 	return buf;

 }

 

 char* trim_str(char* s)

-{   

+{

 	if (s == NULL) return NULL;

 	size_t len = mir_strlen(s);

 

-	while (len)

-	{

-		if (isspace(s[len-1])) --len;

+	while (len) {

+		if (isspace(s[len - 1])) --len;

 		else break;

 	}

-	s[len]=0;

+	s[len] = 0;

 

-	char* sc = s; 

+	char* sc = s;

 	while (isspace(*sc)) ++sc;

-	memcpy(s,sc,mir_strlen(sc)+1);

+	memcpy(s, sc, mir_strlen(sc) + 1);

 

 	return s;

 }

@@ -379,7 +362,7 @@ retry:
 	id = get_random();

 

 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-		for(int i=1; ;++i) {

+		for (int i = 1; ; ++i) {

 			unsigned short item_id = getBuddyId(hContact, i);

 			if (item_id == 0) break;

 

@@ -398,7 +381,7 @@ unsigned short* CAimProto::get_members_of_group(unsigned short group_id, unsigne
 	size = 0;

 

 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-		for(int i=1; ;++i) {

+		for (int i = 1; ; ++i) {

 			unsigned short user_group_id = getGroupId(hContact, i);

 			if (user_group_id == 0)

 				break;

@@ -407,7 +390,7 @@ unsigned short* CAimProto::get_members_of_group(unsigned short group_id, unsigne
 				unsigned short buddy_id = getBuddyId(hContact, i);

 				if (buddy_id) {

 					list = (unsigned short*)mir_realloc(list, ++size*sizeof(list[0]));

-					list[size-1] = _htons(buddy_id);

+					list[size - 1] = _htons(buddy_id);

 				}

 			}

 		}

@@ -419,7 +402,7 @@ void CAimProto::upload_nicks(void)
 {

 	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

 		DBVARIANT dbv;

-		if ( !db_get_utf(hContact, MOD_KEY_CL, "MyHandle", &dbv)) {

+		if (!db_get_utf(hContact, MOD_KEY_CL, "MyHandle", &dbv)) {

 			set_local_nick(hContact, dbv.pszVal, NULL);

 			db_free(&dbv);

 		}

@@ -431,15 +414,14 @@ void CAimProto::set_local_nick(MCONTACT hContact, char* nick, char* note)
 	DBVARIANT dbv;

 	if (getString(hContact, AIM_KEY_SN, &dbv)) return;

 

-	for(int i=1; ;++i)

-	{

+	for (int i = 1; ; ++i) {

 		unsigned short group_id = getGroupId(hContact, i);

 		if (group_id == 0) break;

 

 		unsigned short buddy_id = getBuddyId(hContact, i);

 		if (buddy_id == 0) break;

 

-		aim_mod_buddy(hServerConn, seqno, dbv.pszVal, buddy_id, group_id, nick, note);

+		aim_mod_buddy(m_hServerConn, m_seqno, dbv.pszVal, buddy_id, group_id, nick, note);

 	}

 	db_free(&dbv);

 }

@@ -453,7 +435,7 @@ unsigned short BdList::get_free_id(void)
 retry:

 	id = get_random();

 

-	for (int i=0; i<count; ++i)

+	for (int i = 0; i < count; ++i)

 		if (items[i]->item_id == id) goto retry;

 

 	return id;

@@ -461,8 +443,7 @@ retry:
 

 unsigned short BdList::find_id(const char* name)

 {

-	for (int i=0; i<count; ++i)

-	{

+	for (int i = 0; i < count; ++i) {

 		if (_stricmp(items[i]->name, name) == 0)

 			return items[i]->item_id;

 	}

@@ -471,8 +452,7 @@ unsigned short BdList::find_id(const char* name)
 

 char* BdList::find_name(unsigned short id)

 {

-	for (int i=0; i<count; ++i)

-	{

+	for (int i = 0; i < count; ++i) {

 		if (items[i]->item_id == id)

 			return items[i]->name;

 	}

@@ -481,10 +461,8 @@ char* BdList::find_name(unsigned short id)
 

 void BdList::remove_by_id(unsigned short id)

 {

-	for (int i=0; i<count; ++i)

-	{

-		if (items[i]->item_id == id)

-		{

+	for (int i = 0; i < count; ++i) {

+		if (items[i]->item_id == id) {

 			remove(i);

 			break;

 		}

@@ -495,42 +473,42 @@ void BdList::remove_by_id(unsigned short id)
 

 unsigned short CAimProto::getBuddyId(MCONTACT hContact, int i)

 {

-	char item[sizeof(AIM_KEY_BI)+10];

+	char item[sizeof(AIM_KEY_BI) + 10];

 	mir_snprintf(item, _countof(item), AIM_KEY_BI"%d", i);

 	return getWord(hContact, item, 0);

 }

 

 void CAimProto::setBuddyId(MCONTACT hContact, int i, unsigned short id)

 {

-	char item[sizeof(AIM_KEY_BI)+10];

+	char item[sizeof(AIM_KEY_BI) + 10];

 	mir_snprintf(item, _countof(item), AIM_KEY_BI"%d", i);

 	setWord(hContact, item, id);

 }

 

 int CAimProto::deleteBuddyId(MCONTACT hContact, int i)

 {

-	char item[sizeof(AIM_KEY_BI)+10];

+	char item[sizeof(AIM_KEY_BI) + 10];

 	mir_snprintf(item, _countof(item), AIM_KEY_BI"%d", i);

 	return delSetting(hContact, item);

 }

 

 unsigned short CAimProto::getGroupId(MCONTACT hContact, int i)

 {

-	char item[sizeof(AIM_KEY_GI)+10];

+	char item[sizeof(AIM_KEY_GI) + 10];

 	mir_snprintf(item, _countof(item), AIM_KEY_GI"%d", i);

 	return getWord(hContact, item, 0);

 }

 

 void CAimProto::setGroupId(MCONTACT hContact, int i, unsigned short id)

 {

-	char item[sizeof(AIM_KEY_GI)+10];

+	char item[sizeof(AIM_KEY_GI) + 10];

 	mir_snprintf(item, _countof(item), AIM_KEY_GI"%d", i);

 	setWord(hContact, item, id);

 }

 

 int CAimProto::deleteGroupId(MCONTACT hContact, int i)

 {

-	char item[sizeof(AIM_KEY_GI)+10];

+	char item[sizeof(AIM_KEY_GI) + 10];

 	mir_snprintf(item, _countof(item), AIM_KEY_GI"%d", i);

 	return delSetting(hContact, item);

 }

@@ -550,8 +528,7 @@ int CAimProto::open_contact_file(const char*, const TCHAR* file, const char*, TC
 

 	mir_sntprintf(path + pos, MAX_PATH - pos, _T("\\%s"), file);

 	int fid = _topen(path, _O_CREAT | _O_RDWR | _O_BINARY, _S_IREAD);

-	if (fid < 0)

-	{

+	if (fid < 0) {

 		TCHAR errmsg[512];

 		mir_sntprintf(errmsg, _countof(errmsg), TranslateT("Failed to open file: %s %s"), path, __tcserror(NULL));

 		ShowPopup((char*)errmsg, ERROR_POPUP | TCHAR_POPUP);

@@ -563,10 +540,9 @@ void CAimProto::write_away_message(const char* sn, const char* msg, bool utf)
 {

 	TCHAR* path;

 	int fid = open_contact_file(sn, _T("away.html"), "wb", path, 1);

-	if (fid >= 0)

-	{

+	if (fid >= 0) {

 		if (utf) _write(fid, "\xEF\xBB\xBF", 3);

-		char* s_msg=process_status_msg(msg, sn);

+		char* s_msg = process_status_msg(msg, sn);

 		_write(fid, "<h3>", 4);

 		_write(fid, sn, (unsigned)mir_strlen(sn));

 		_write(fid, "'s Away Message:</h3>", 21);

@@ -576,16 +552,15 @@ void CAimProto::write_away_message(const char* sn, const char* msg, bool utf)
 		mir_free(path);

 		mir_free(s_msg);

 	}

-} 

+}

 

 void CAimProto::write_profile(const char* sn, const char* msg, bool utf)

 {

 	TCHAR* path;

-	int fid = open_contact_file(sn, _T("profile.html"),"wb", path, 1);

-	if (fid >= 0)

-	{

+	int fid = open_contact_file(sn, _T("profile.html"), "wb", path, 1);

+	if (fid >= 0) {

 		if (utf) _write(fid, "\xEF\xBB\xBF", 3);

-		char* s_msg=process_status_msg(msg, sn);

+		char* s_msg = process_status_msg(msg, sn);

 		_write(fid, "<h3>", 4);

 		_write(fid, sn, (unsigned)mir_strlen(sn));

 		_write(fid, "'s Profile:</h3>", 16);

@@ -601,8 +576,7 @@ unsigned long aim_oft_checksum_chunk(unsigned long dwChecksum, const unsigned ch
 {

 	unsigned long checksum = (dwChecksum >> 16) & 0xffff;

 

-	for (int i = 0; i < len; i++)

-	{

+	for (int i = 0; i < len; i++) {

 		unsigned val = buffer[i];

 

 		if ((i & 1) == 0)

@@ -616,16 +590,14 @@ unsigned long aim_oft_checksum_chunk(unsigned long dwChecksum, const unsigned ch
 	return checksum << 16;

 }

 

-unsigned int aim_oft_checksum_file(TCHAR *filename, unsigned __int64 size) 

+unsigned int aim_oft_checksum_file(TCHAR *filename, unsigned __int64 size)

 {

 	unsigned long checksum = 0xffff0000;

 	int fid = _topen(filename, _O_RDONLY | _O_BINARY, _S_IREAD);

-	if (fid >= 0)  

-	{

+	if (fid >= 0) {

 		unsigned __int64 sz = _filelengthi64(fid);

-		if (size > sz) size = sz; 

-		while (size)

-		{

+		if (size > sz) size = sz;

+		while (size) {

 			unsigned char buffer[8912];

 			int bytes = (int)min(size, sizeof(buffer));

 			bytes = _read(fid, buffer, bytes);

@@ -642,8 +614,7 @@ char* long_ip_to_char_ip(unsigned long host, char* ip)
 	host = _htonl(host);

 	unsigned char* bytes = (unsigned char*)&host;

 	size_t buf_loc = 0;

-	for(int i=0; i<4; i++)

-	{

+	for (int i = 0; i < 4; i++) {

 		char store[16];

 		_itoa(bytes[i], store, 10);

 		size_t len = mir_strlen(store);

@@ -659,10 +630,9 @@ char* long_ip_to_char_ip(unsigned long host, char* ip)
 

 unsigned long char_ip_to_long_ip(char* ip)

 {

-	unsigned char chost[4] = {0}; 

+	unsigned char chost[4] = { 0 };

 	char *c = ip;

-	for(int i=0; i<4; ++i)

-	{

+	for (int i = 0; i < 4; ++i) {

 		chost[i] = (unsigned char)atoi(c);

 		c = strchr(c, '.');

 		if (c) ++c;