more warning fixes

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

7 files changed, 21 insertions, 23 deletions

diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index 7d2f6a8771..33c9778e0f 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"

 

-INT_PTR CALLBACK DlgProcContactInfo(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgProcContactInfo(HWND hwnd, UINT msg, WPARAM, LPARAM lParam)

 {

 	switch (msg) {

 	case WM_INITDIALOG:

@@ -479,7 +479,7 @@ void ExportContact(MCONTACT hContact)
 	}

 }

 

-INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam)

+INT_PTR ImportContacts(WPARAM, LPARAM)

 {

 	MCONTACT hContact;

 	char name[256] = "", program[256] = "", programparam[256] = "", group[256] = "", line[2001] = "";

diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp
index e8bcf519c0..5690b5a2f9 100644
--- a/plugins/Non-IM Contact/src/dialog.cpp
+++ b/plugins/Non-IM Contact/src/dialog.cpp
@@ -49,7 +49,6 @@ INT_PTR CALLBACK DlgProcNimcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 					SetDlgItemText(hwnd, IDC_TIMER_INT, _T("1"));

 			}

 			break;

-			return TRUE;

 		}

 		break;

 

@@ -95,7 +94,7 @@ braceList[VARS] =
 };

 int braceOrder[MAX_BRACES] = { 0 };

 

-INT_PTR CALLBACK HelpWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK HelpWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM)

 {

 	switch (msg) {

 	case WM_INITDIALOG:

@@ -114,7 +113,7 @@ INT_PTR CALLBACK HelpWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 	return FALSE;

 }

 

-INT_PTR CALLBACK TestWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK TestWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM)

 {

 	switch (msg) {

 	case WM_INITDIALOG:

@@ -218,7 +217,7 @@ INT_PTR LoadFilesDlg(WPARAM, LPARAM)
 

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

 

-static int CALLBACK PropSheetProc(HWND hwnd, UINT uMsg, LPARAM lParam)

+static int CALLBACK PropSheetProc(HWND, UINT uMsg, LPARAM lParam)

 {

 	if (uMsg == PSCB_PRECREATE) {

 		// Remove the DS_CONTEXTHELP style from the

@@ -299,7 +298,7 @@ void DoPropertySheet(MCONTACT hContact, HINSTANCE hInst)
 	PropertySheetA(&psh);

 }

 

-INT_PTR addContact(WPARAM wParam, LPARAM lParam)

+INT_PTR addContact(WPARAM, LPARAM)

 {

 	char tmp[256];

 	MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

@@ -313,7 +312,7 @@ INT_PTR addContact(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR editContact(WPARAM wParam, LPARAM lParam)

+INT_PTR editContact(WPARAM wParam, LPARAM)

 {

 	MCONTACT hContact = wParam;

 	char tmp[256];

diff --git a/plugins/Non-IM Contact/src/files.cpp b/plugins/Non-IM Contact/src/files.cpp
index 48f85ecd83..0ba3631be1 100644
--- a/plugins/Non-IM Contact/src/files.cpp
+++ b/plugins/Non-IM Contact/src/files.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"

 

-INT_PTR exportContacts(WPARAM wParam, LPARAM lParam)

+INT_PTR exportContacts(WPARAM, LPARAM)

 {

 	char fn[MAX_PATH];

 	if (!Openfile(fn, 0))

@@ -101,7 +101,7 @@ int savehtml(char* outFile)
 

 void readFile(HWND hwnd)

 {

-	int lineNumber, fileLength = 0, width = 0;

+	int lineNumber, fileLength = 0;

 	char temp[MAX_STRING_LENGTH], szFileName[512], temp1[MAX_STRING_LENGTH], fn[8];

 	int fileNumber = SendDlgItemMessage(hwnd, IDC_FILE_LIST, CB_GETCURSEL, 0, 0);

 	mir_snprintf(fn, "fn%d", fileNumber);

@@ -275,7 +275,6 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		case IDCANCEL:

 			DestroyWindow(hwnd);

 			break;

-			return TRUE;

 		}

 		break;

 

diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp
index fa668b55d3..7c431bb8e3 100644
--- a/plugins/Non-IM Contact/src/main.cpp
+++ b/plugins/Non-IM Contact/src/main.cpp
@@ -24,7 +24,7 @@ PLUGININFOEX pluginInfoEx = {
 	{ 0x2e0d2ae3, 0xe123, 0x4607, {0x85, 0x39, 0xd4, 0x44, 0x8d, 0x67, 0x5d, 0xdb} }

 };

 

-INT_PTR doubleClick(WPARAM wParam, LPARAM lParam)

+INT_PTR doubleClick(WPARAM wParam, LPARAM)

 {

 	char program[MAX_PATH], params[MAX_PATH];

 	int shellEXEerror = 0;

@@ -77,7 +77,7 @@ int NimcOptInit(WPARAM wParam, LPARAM)
 // Description : Sets plugin info

 //=====================================================

 

-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfoEx;

 }

@@ -89,13 +89,13 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 // Description :

 //=====================================================

 

-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD, LPVOID)

 {

 	hInst = hinst;

 	return TRUE;

 }

 

-int ModulesLoaded(WPARAM wParam, LPARAM lParam)

+int ModulesLoaded(WPARAM, LPARAM)

 {

 	NetlibInit();

 	return 0;

diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp
index 49ca6cae90..973d689ee3 100644
--- a/plugins/Non-IM Contact/src/namereplacing.cpp
+++ b/plugins/Non-IM Contact/src/namereplacing.cpp
@@ -141,7 +141,7 @@ int findLine(char* FileContents[], const char* string, int linesInFile, int star
 	return -1;

 }

 

-int findChar(char* FileContents[], const char* string, int linesInFile, int startLine, int *positionInOldString, int startChar, int startEnd) // 0=start, 1=end for startEnd

+int findChar(char* FileContents[], const char* string, int startLine, int *positionInOldString, int startChar, int startEnd) // 0=start, 1=end for startEnd

 {

 	char tmp[5];

 	int i = getNumber(&string[*positionInOldString]);

@@ -486,7 +486,7 @@ int stringReplacer(const char *oldString, CMStringA &szNewString, MCONTACT hCont
 					startLine = tempInt;

 					if (!endChar)

 						endChar = (int)mir_strlen(fileContents[startLine]);

-					tempInt = findChar(fileContents, oldString, linesInFile, startLine, &positionInOldString, startChar, 0);

+					tempInt = findChar(fileContents, oldString, startLine, &positionInOldString, startChar, 0);

 					if (tempInt == -1)

 						return ERROR_NO_LINE_AFTER_VAR_F;

 					startChar = tempInt;

@@ -502,7 +502,7 @@ int stringReplacer(const char *oldString, CMStringA &szNewString, MCONTACT hCont
 

 				positionInOldString += 2;

 				endLine = tempInt;

-				tempInt = findChar(fileContents, oldString, linesInFile, startLine, &positionInOldString, startChar, 1);

+				tempInt = findChar(fileContents, oldString, startLine, &positionInOldString, startChar, 1);

 				if (tempInt == -1)

 					return ERROR_NO_LINE_AFTER_VAR_F;

 				endChar = tempInt;

diff --git a/plugins/Non-IM Contact/src/services.cpp b/plugins/Non-IM Contact/src/services.cpp
index c582f4b7e4..e6fcfb3da3 100644
--- a/plugins/Non-IM Contact/src/services.cpp
+++ b/plugins/Non-IM Contact/src/services.cpp
@@ -18,7 +18,7 @@ int db_get_static(MCONTACT hContact, const char *szModule, const char *szSetting
 // GetCaps

 //=======================================================

 

-INT_PTR GetLCCaps(WPARAM wParam, LPARAM lParam)

+INT_PTR GetLCCaps(WPARAM wParam, LPARAM)

 {

 	if (wParam == PFLAGNUM_1)

 		return 0;

@@ -41,7 +41,7 @@ INT_PTR GetLCName(WPARAM wParam, LPARAM lParam)
 //=======================================================

 // BPLoadIcon

 //=======================================================

-INT_PTR LoadLCIcon(WPARAM wParam, LPARAM lParam)

+INT_PTR LoadLCIcon(WPARAM wParam, LPARAM)

 {

 	if (LOWORD(wParam) == PLI_PROTOCOL) {

 		if (wParam & PLIF_ICOLIBHANDLE)

@@ -63,7 +63,7 @@ INT_PTR LoadLCIcon(WPARAM wParam, LPARAM lParam)
 // SetFStatus			

 //=======================================================

 

-int SetLCStatus(WPARAM wParam, LPARAM lParam)

+int SetLCStatus(WPARAM wParam, LPARAM)

 {

 	int oldStatus = LCStatus;

 	LCStatus = wParam;

@@ -114,7 +114,7 @@ int SetLCStatus(WPARAM wParam, LPARAM lParam)
 // GetStatus

 //=======================================================

 

-INT_PTR GetLCStatus(WPARAM wParam, LPARAM lParam)

+INT_PTR GetLCStatus(WPARAM, LPARAM)

 {

 	if ((LCStatus >= ID_STATUS_ONLINE) && (LCStatus <= ID_STATUS_OUTTOLUNCH))

 		return LCStatus;

diff --git a/plugins/Non-IM Contact/src/timer.cpp b/plugins/Non-IM Contact/src/timer.cpp
index 32afa0ff35..3bf775e6fa 100644
--- a/plugins/Non-IM Contact/src/timer.cpp
+++ b/plugins/Non-IM Contact/src/timer.cpp
@@ -9,7 +9,7 @@ static UINT_PTR timerId = 0;
 // Description : called when the timer interval occurs

 //=====================================================

 

-void timerFunc(void *di)

+void timerFunc(void*)

 {

 	char text[512], fn[16], szFileName[MAX_PATH], temp[MAX_PATH];