warning fixes

miranda-ng · Mar 13, 2021 · b10f9d1 · b10f9d1
1 parent c29f438
commit b10f9d1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
@@ -52,7 +52,7 @@ INT_PTR CSametimeProto::GetName(WPARAM wParam, LPARAM lParam)
 * @param wParam :	icon type
 * @return			an \c HICON in which the icon has been loaded.
 */
-INT_PTR CSametimeProto::SametimeLoadIcon(WPARAM wParam, LPARAM lParam)
+INT_PTR CSametimeProto::SametimeLoadIcon(WPARAM wParam, LPARAM)
 {
 
 	UINT id;

diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp
@@ -93,7 +93,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 					// build recipient list
 					safArg->recipients = nullptr;
 
-					int size = ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_LST_ANTO));
+					size = ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_LST_ANTO));
 					int send_count = 0;
 					for (int i = 0; i < size; i++) {
 						if (ListView_GetCheckState(GetDlgItem(hwndDlg, IDC_LST_ANTO), i)) {

diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp
@@ -158,9 +158,9 @@ void CSametimeProto::ImportContactsFromList(mwSametimeList* user_list, bool temp
 			id_block.user = (char*)group_name;
 			id_block.community = nullptr;
 
-			GList* gl = g_list_prepend(nullptr, &id_block);
-			mwAwareList_addAware(aware_list, gl);
-			g_list_free(gl);
+			GList* gl1 = g_list_prepend(nullptr, &id_block);
+			mwAwareList_addAware(aware_list, gl1);
+			g_list_free(gl1);
 		}
 
 		ul = utl = mwSametimeGroup_getUsers(stgroup);
@@ -195,7 +195,6 @@ void CSametimeProto::ExportContactsToList(mwSametimeList* user_list)
 	mwAwareIdBlock id_block;
 	mwIdBlock uid;
 
-	GList* gl = nullptr;
 	for (auto &hContact : AccContacts()) {
 		if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
 			if (dbv.pszVal) {
@@ -348,7 +347,7 @@ CSametimeProto* getProtoFromMwServiceStorage(mwServiceStorage* srvcStorage)
 	return (CSametimeProto*)mwSession_getProperty(session, "PROTO_STRUCT_PTR");
 }
 
-void load_users_callback(mwServiceStorage* srvc, guint32 result, mwStorageUnit *item, gpointer data)
+void load_users_callback(mwServiceStorage* srvc, guint32, mwStorageUnit *item, gpointer)
 {
 	CSametimeProto* proto = getProtoFromMwServiceStorage(srvc);
 
@@ -397,7 +396,7 @@ CSametimeProto* getProtoFromMwServiceResolve(mwServiceResolve* srvcResolve)
 }
 
 
-void mwResolve_handler_dyngroup_callback(mwServiceResolve* srvc, guint32 id, guint32 code, GList *results, gpointer data)
+void mwResolve_handler_dyngroup_callback(mwServiceResolve* srvc, guint32, guint32, GList *results, gpointer data)
 {
 	CSametimeProto* proto = getProtoFromMwServiceResolve(srvc);
 	mwSametimeGroup* stgroup = (mwSametimeGroup*)data;
@@ -555,11 +554,11 @@ void mwAwareList_on_aware(mwAwareList* list, mwAwareSnapshot* aware)
 }
 
 
-void mwAwareList_on_attrib(mwAwareList* list, mwAwareIdBlock* id, mwAwareAttribute* attrib)
+void mwAwareList_on_attrib(mwAwareList*, mwAwareIdBlock*, mwAwareAttribute*)
 {}
 
 
-void mwAwareList_clear(mwAwareList* list)
+void mwAwareList_clear(mwAwareList*)
 {}
 
 mwAwareListHandler mwAwareList_handler =
@@ -692,7 +691,7 @@ void mwResolve_handler_callback(mwServiceResolve* srvc, guint32 id, guint32 code
 	}
 }
 
-void mwResolve_handler_details_callback(mwServiceResolve* srvc, guint32 id, guint32 code, GList* results, gpointer data)
+void mwResolve_handler_details_callback(mwServiceResolve* srvc, guint32, guint32 code, GList* results, gpointer)
 {
 	CSametimeProto* proto = getProtoFromMwServiceResolve(srvc);
 
@@ -743,7 +742,7 @@ int CSametimeProto::GetMoreDetails(const char* name)
 	return 0; // fail
 }
 
-INT_PTR CALLBACK CALLBACK SearchDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK CALLBACK SearchDialogFunc(HWND hwndDlg, UINT msg, WPARAM, LPARAM)
 {
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -780,11 +779,11 @@ MCONTACT CSametimeProto::AddSearchedUser(MYPROTOSEARCHRESULT* mpsr, bool tempora
 	return hContact;
 }
 
-void mwServiceAware_on_attrib_callback(mwServiceAware* srvc, mwAwareAttribute* attrib)
+void mwServiceAware_on_attrib_callback(mwServiceAware*, mwAwareAttribute*)
 {
 }
 
-void mwServiceAware_clear_callback(mwServiceAware* srvc)
+void mwServiceAware_clear_callback(mwServiceAware*)
 {
 }
 

diff --git a/protocols/Sametime/src/utils.cpp b/protocols/Sametime/src/utils.cpp
@@ -141,7 +141,7 @@ void CSametimeProto::showPopup(guint32 code)
 	g_free(rcDesc);
 }
 
-void LogFromGLib(const gchar* log_domain, GLogLevelFlags log_level, const gchar* message, gpointer user_data)
+void LogFromGLib(const gchar*, GLogLevelFlags, const gchar* message, gpointer user_data)
 {
 	CSametimeProto* proto = (CSametimeProto*)user_data;
 	proto->debugLogW(_A2T(message));

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
@@ -1446,7 +1446,7 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport
 			const JSONNode& jnUnknown = jnAttach[jnAttach["type"].as_string().c_str()];
 			CMStringW wszText(jnUnknown["text"].as_mstring());
 			if (!wszText.IsEmpty())
-				res.AppendFormat(L"\n%s: %s", TranslateT("Text"), wszText);
+				res.AppendFormat(L"\n%s: %s", TranslateT("Text"), wszText.c_str());
 		}
 
 		res.AppendChar('\n');

diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
@@ -237,7 +237,6 @@ void CVkProto::OnReceiveChatInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 
 	const JSONNode &jnMsgs = jnResponse["msgs"];
 	const JSONNode &jnFUsers = jnResponse["fwd_users"];
-	const JSONNode &jnGUsers = jnResponse["groups"];
 	if (jnMsgs) {
 		const JSONNode &jnItems = jnMsgs["items"];
 		if (jnItems) {