some code cleaning

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

6 files changed, 9 insertions, 16 deletions

diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index 48bfd898ba..ab9011b8b4 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -40,7 +40,6 @@ bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *
 			std::tstring filename = GetAvatarFolder() + L'\\' + dbv.ptszVal + (TCHAR*)_A2T(ext.c_str());

 			db_free(&dbv);			

 

-			ai.hContact = ai.hContact;

 			_tcsncpy_s(ai.filename, SIZEOF(ai.filename), filename.c_str(), _TRUNCATE);

 			ai.format = ProtoGetAvatarFormat(ai.filename);

 			return true;

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 85547d09bb..fb2f712265 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -583,7 +583,7 @@ NETLIBHTTPHEADER* facebook_client::get_request_headers(int request_type, int* he
 std::string facebook_client::get_newsfeed_type()

 {

 	BYTE feed_type = parent->getByte(FACEBOOK_KEY_FEED_TYPE, 0);

-	if (feed_type < 0 || feed_type >= SIZEOF(feed_types))

+	if (feed_type >= SIZEOF(feed_types))

 		feed_type = 0;	

 	return feed_types[feed_type].id;

 }

@@ -591,7 +591,7 @@ std::string facebook_client::get_newsfeed_type()
 std::string facebook_client::get_server_type()

 {

 	BYTE server_type = parent->getByte(FACEBOOK_KEY_SERVER_TYPE, 0);

-	if (server_type < 0 || server_type >= SIZEOF(server_types))

+	if (server_type >= SIZEOF(server_types))

 		server_type = 0;

 	return server_types[server_type].id;

 }

@@ -599,7 +599,7 @@ std::string facebook_client::get_server_type()
 std::string facebook_client::get_privacy_type()

 {

 	BYTE privacy_type = parent->getByte(FACEBOOK_KEY_PRIVACY_TYPE, 0);

-	if (privacy_type < 0 || privacy_type >= SIZEOF(privacy_types))

+	if (privacy_type >= SIZEOF(privacy_types))

 		privacy_type = 0;

 	return privacy_types[privacy_type].id;

 }

diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index fbc388bf26..e946928c4f 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -408,7 +408,7 @@ INT_PTR CALLBACK FBOptionsProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 			proto->setString(FACEBOOK_KEY_PASS, str);

 

 			GetDlgItemText(hwnd,IDC_GROUP,tstr,sizeof(tstr));

-			if (lstrlen(tstr) > 0)

+			if (tstr[0] != '\0')

 			{

 				proto->setTString(FACEBOOK_KEY_DEF_GROUP, tstr);

 				Clist_CreateGroup( 0, tstr);

diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index 9abb95c088..4611d3119b 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -515,7 +515,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
 						}

 					}

 

-					HANDLE hChatContact;

+					HANDLE hChatContact = NULL;

 

 					// RM TODO: better use check if chatroom exists/is in db/is online... no?

 					/// e.g. HANDLE hChatContact = proto->ChatIDToHContact(thread_id); ?

@@ -593,7 +593,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
 				if (time_ == NULL)

 					continue;

 				JSONNODE *time = json_get(time_, "time");

-				if (time == NULL || text == NULL || url == NULL || alert_id == NULL || time == NULL)

+				if (time == NULL || text == NULL || url == NULL || alert_id == NULL)

 					continue;

 

 				unsigned __int64 timestamp = json_as_float(time);

@@ -659,7 +659,6 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
 			JSONNODE *time_ = json_get(it, "actor");

 			JSONNODE *story_ = json_get(it, "story_xhp");

 

-			std::string id = json_as_pstring(actor_);

 			time_t time = json_as_float(time_);

 			std::string text = json_as_pstring(story_);

 			text = utils::text::slashu_to_utf8(text);

@@ -711,7 +710,6 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
 			JSONNODE *alert_ids = json_get(it, "alert_ids");

 			for (unsigned int n = 0; n < json_size(alert_ids); n++) {

 				JSONNODE *idItr = json_at(alert_ids, n);

-				std::string alert_id = json_as_pstring(idItr);

 

 				// PUDeletePopup(hWndPopup);

 			}

diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index 866bc8cf00..e4731c0111 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -357,7 +357,7 @@ void FacebookProto::ProcessUnreadMessage(void *p)
 			for (std::map<std::string, facebook_chatroom*>::iterator it = chatrooms.begin(); it != chatrooms.end(); ) {

 

 				facebook_chatroom *room = it->second;

-				HANDLE hChatContact;

+				HANDLE hChatContact = NULL;

 				if (GetChatUsers(room->thread_id.c_str()) == NULL) {

 					AddChat(room->thread_id.c_str(), room->chat_name.c_str());

 					hChatContact = ChatIDToHContact(room->thread_id);

@@ -366,7 +366,7 @@ void FacebookProto::ProcessUnreadMessage(void *p)
 

 					for (std::map<std::string, std::string>::iterator jt = room->participants.begin(); jt != room->participants.end(); ) {

 						AddChatContact(room->thread_id.c_str(), jt->first.c_str(), jt->second.c_str());

-						jt++;

+						++jt;

 					}

 				}

 

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 834f096c3d..86ab425c2d 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -63,12 +63,9 @@ FacebookProto::FacebookProto(const char* proto_name,const TCHAR* username) :
 

 	// Create standard network connection

 	TCHAR descr[512];

-	char module[512];

 	NETLIBUSER nlu = {sizeof(nlu)};

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

 	nlu.szSettingsModule = m_szModuleName;

-	mir_snprintf(module, SIZEOF(module), "%s", m_szModuleName);

-	nlu.szSettingsModule = module;

 	mir_sntprintf(descr, SIZEOF(descr), TranslateT("%s server connection"), m_tszUserName);

 	nlu.ptszDescriptiveName = descr;

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

@@ -726,8 +723,7 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 	{

 		// After close, free

 		popup_data *data = (popup_data *)PUGetPluginData(hwnd);

-		if (data != NULL)

-			delete data;

+		delete data;

 	} return FALSE;

 

 	default: