From e96132b4d5344d2d58d247906bcaefccfb9d5253 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 20 Dec 2023 13:34:45 +0300
Subject: DBEVENTINFO::hContact to be returned inside an event, no need to call
 db_event_getContact() just after db_event_get()

---
 plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 2 +-
 plugins/UserInfoEx/src/mir_db.cpp                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/UserInfoEx')

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 3e4cd100de..33faddebfe 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -923,7 +923,7 @@ int CExImContactXML::ImportEvent(LPCSTR pszModule, const TiXmlElement *xmlEvent)
 		return ERROR_INVALID_VALUE;
 
 	size_t baselen;
-	mir_ptr<uint8_t> tmpVal((uint8_t*)mir_base64_decode(tmp, &baselen));
+	mir_ptr<char > tmpVal((char *)mir_base64_decode(tmp, &baselen));
 	if (tmpVal != NULL) {
 		// event owning module
 		dbei.pBlob = tmpVal;
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index 176753d2cc..4ec519f6b1 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -508,7 +508,7 @@ bool GetInfoWithData(MEVENT hEvent, DBEVENTINFO *dbei)
 		dbei->cbBlob = (size != -1) ? (uint32_t)size : 0;
 	}
 	if (dbei->cbBlob) {
-		dbei->pBlob = (uint8_t*) mir_alloc(dbei->cbBlob);
+		dbei->pBlob = (char *)mir_alloc(dbei->cbBlob);
 		if (dbei->pBlob == nullptr)
 			dbei->cbBlob = 0;
 	}
-- 
cgit v1.2.3