summaryrefslogtreecommitdiff
path: root/plugins/UserInfoEx/src/ex_import
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2015-08-08 06:57:14 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2015-08-08 06:57:14 +0000
commit4a0631399b72ff7a62ffc2da69150551e990e0d9 (patch)
tree636747c4083923dc96ebb8f0d06019746493b0da /plugins/UserInfoEx/src/ex_import
parent88a14e8dc56bb77b09e52c8aebe5cd6f47039366 (diff)
UserInfoEx:
- Warnings fixed git-svn-id: http://svn.miranda-ng.org/main/trunk@14857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import')
-rw-r--r--plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp1
-rw-r--r--plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp2
-rw-r--r--plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp2
-rw-r--r--plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp3
-rw-r--r--plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp5
-rw-r--r--plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp8
-rw-r--r--plugins/UserInfoEx/src/ex_import/tinyxml.h2
7 files changed, 9 insertions, 14 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 22bb4cea5f..456c704ad8 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -283,7 +283,6 @@ void CExImContactBase::toIni(FILE* file, int modCount)
{
// getting dbeditor++ NickFromHContact(hContact)
static char name[512] = "";
- char* ret = 0;
if (_hContact){
int loaded = _pszUIDKey ? 1 : 0;
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index fcdd7b15c4..a53afbe1b6 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -398,7 +398,7 @@ BYTE CExImContactXML::ExportEvents()
if (dwNumEvents == 0)
return FALSE;
- DWORD cbEventBuf = 0, dwNumEventsAdded = 0;
+ DWORD dwNumEventsAdded = 0;
// read out all events for the current contact
for (MEVENT hDbEvent = db_event_first(_hContact); hDbEvent != NULL; hDbEvent = db_event_next(_hContact, hDbEvent)) {
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index 449b84cace..870f536389 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -166,7 +166,7 @@ static LRESULT CALLBACK PlacesBarSubclassProc(HWND hWnd, UINT uMsg, WPARAM wPara
* lParam - message dependend parameter
* return: depends on message
**/
-static UINT_PTR CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM, LPARAM lParam)
{
switch (uMsg) {
case WM_NOTIFY:
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index 2491f58242..a3010a90c5 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -293,7 +293,7 @@ static DWORD ImportreadLine(FILE* file, LPSTR &str)
* cchBuf - character count of the buffer
* return: handle to the contact that matches the information or NULL if no match
**/
-static MCONTACT ImportFindContact(MCONTACT hContact, LPSTR &strBuf, BYTE bCanCreate)
+static MCONTACT ImportFindContact(MCONTACT, LPSTR &strBuf, BYTE bCanCreate)
{
CExImContactBase vcc;
@@ -321,7 +321,6 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine)
{
DBVARIANT dbv;
LPSTR end, value;
- size_t numLines = 0;
size_t brk;
LPSTR pszLine = strLine;
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index 2d9e69541f..61ff1f1521 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -670,10 +670,7 @@ CVCardFileVCF::CVCardFileVCF()
**/
size_t CVCardFileVCF::packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *cbRew)
{
- UINT i;
- WORD wAdd = 0;
-
- for (i = 0; i < nList; i++) {
+ for (UINT i = 0; i < nList; i++) {
if (pList[i].nID == iID) {
return (_clVal + pList[i].ptszTranslated);
}
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index fa5139c530..36383cf771 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -208,7 +208,7 @@ if (ExImContact->Typ == EXIM_ACCOUNT ||
/*********************************
* Ex/import All (MainMenu)
*********************************/
-INT_PTR svcExIm_MainExport_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_MainExport_Service(WPARAM, LPARAM lParam)
{
ExImParam ExIm;
memset(&ExIm, 0, sizeof(ExIm));
@@ -217,7 +217,7 @@ INT_PTR svcExIm_MainExport_Service(WPARAM wParam, LPARAM lParam)
return SvcExImport_Export(&ExIm, (HWND)lParam);
}
-INT_PTR svcExIm_MainImport_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_MainImport_Service(WPARAM, LPARAM lParam)
{
ExImParam ExIm;
memset(&ExIm, 0, sizeof(ExIm));
@@ -262,7 +262,7 @@ INT_PTR svcExIm_ContactImport_Service(WPARAM hContact, LPARAM lParam)
*
* @return always 0
**/
-INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM)
{
ExImParam ExIm;
INT_PTR hItem = 0, hRoot = 0, hParent = 0;
@@ -328,7 +328,7 @@ typedef struct
* @return always 0
**/
-INT_PTR svcExIm_Account_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_Account_Service(WPARAM, LPARAM lParam)
{
ExImParam ExIm;
memset(&ExIm, 0, sizeof(ExIm));
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.h b/plugins/UserInfoEx/src/ex_import/tinyxml.h
index 536fabef74..b40797c079 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxml.h
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.h
@@ -788,7 +788,7 @@ public:
virtual void Print(FILE* cfile, int depth) const;
virtual void StreamOut(TIXML_OSTREAM * out) const;
- virtual void FormattedStreamOut(TIXML_OSTREAM * stream, int depth) const {}
+ virtual void FormattedStreamOut(TIXML_OSTREAM *, int) const {}
// [internal use]
// Set the document pointer so the attribute can report errors.