From 038f6cc65778c17300ce5c62bb25723f7fa16714 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Mon, 8 Jun 2015 19:41:14 +0000
Subject: UserInfoEx: - minor warnings fixed

git-svn-id: http://svn.miranda-ng.org/main/trunk@14067 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 .../src/ex_import/classExImContactBase.cpp          |  4 ----
 .../src/ex_import/classExImContactXML.cpp           |  3 +--
 plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp    | 21 ++++++++++-----------
 3 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'plugins/UserInfoEx/src/ex_import')

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index e968284786..a85bff5d88 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -457,10 +457,6 @@ LPSTR CExImContactBase::uid2String(BYTE bPrependType)
 					return NULL;
 				memset(r, 0, baselen);
 				ptr = r;
-				if (bPrependType) { // XXX dead code.
-					ptr[0] = 'n';
-					ptr ++;
-				}
 				for (SIZE_T j = 0; j < _dbvUID.cpbVal; j ++, ptr += 3) {
 					mir_snprintf(ptr, ((r + baselen) - ptr), "%02X ", (BYTE)_dbvUID.pbVal[j]);
 				}
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index d73bcd334a..e210d536a1 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -701,8 +701,7 @@ int CExImContactXML::Import(BYTE keepMetaSubContact)
 					while (xContact = xContact->NextSiblingElement("CONTACT"));
 			}
 			// load metacontact information (after subcontact for faster import)
-			ImportContact();
-			return ERROR_OK;
+			return ImportContact();
 		}
 		// import sub contacts as normal contacts
 		return _pXmlFile->ImportContacts(_xmlNode);
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index 42aa54c2b4..e5c76ffa95 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -434,17 +434,16 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine)
  **/
 int SvcExImINI_Import(MCONTACT hContact, LPCSTR pszFileName)
 {
-	FILE	*file;
-	MCONTACT hNewContact = INVALID_CONTACT_ID;
-	DWORD	end,
-			numLines				= 0;
-	CHAR	szModule[MAXSETTING]	= {0};
-	WORD	numContactsInFile		= 0,		// number of contacts in the inifile
-			numContactsAdded		= 0;		// number of contacts, that were added to the database
-	CHAR	*strBuf					= (CHAR *) mir_alloc(1);
-			*strBuf					= 0;
-	
-	if (file = fopen(pszFileName, "rt")) {
+	FILE *file = fopen(pszFileName, "rt");
+	if (file) {
+		MCONTACT hNewContact = INVALID_CONTACT_ID;
+		DWORD	end,
+				numLines				= 0;
+		CHAR	szModule[MAXSETTING]	= {0};
+		WORD	numContactsInFile		= 0,		// number of contacts in the inifile
+				numContactsAdded		= 0;		// number of contacts, that were added to the database
+		CHAR	*strBuf					= (CHAR *) mir_alloc(1);
+				*strBuf					= 0;
 		SetCursor(LoadCursor(NULL, IDC_WAIT));
 
 		while (ImportreadLine(file, strBuf)) {
-- 
cgit v1.2.3