From: Sampath Arunachalam <sampath.a@samsung.com>
Date: Mon, 3 Feb 2020 15:53:42 +0000 (+0530)
Subject: Fix dlog build error
X-Git-Tag: submit/tizen/20200206.053818^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F223747%2F1;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git

Fix dlog build error

[Model] Tizen5.5
[BinType] AP
[Customer] Open
[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A
[Problem] Fix dlog build error
[Cause & Measure] Fix dlog build error
[Checking Method] N/A
[Team] Message
[Developer] A Sampath
[Solution company] Samsung
[Change Type] etc

Change-Id: I95ca165d2da792c7629e5062df53f0f567e739ca
---

diff --git a/plugin/sms_plugin/3gpp2/Sms3gpp2EventHandler.cpp b/plugin/sms_plugin/3gpp2/Sms3gpp2EventHandler.cpp
index 48e3146..d61984e 100755
--- a/plugin/sms_plugin/3gpp2/Sms3gpp2EventHandler.cpp
+++ b/plugin/sms_plugin/3gpp2/Sms3gpp2EventHandler.cpp
@@ -587,7 +587,7 @@ void Sms3gpp2EventHandler::handleMsgIncoming(TapiHandle *handle, sms_3gpp2_trans
 	MSG_DEBUG("msgInfo.displayTime : %s", ctime(&msgInfo.displayTime));
 	MSG_DEBUG("msgInfo.msgPort.valid : %d", msgInfo.msgPort.valid);
 	MSG_DEBUG("msgInfo.encodeType : %d", msgInfo.encodeType);
-	MSG_DEBUG("msgInfo.dataSize : %d", msgInfo.dataSize);
+	MSG_DEBUG("msgInfo.dataSize : %zu", msgInfo.dataSize);
 
 	if (msgInfo.bTextSms == true) {
 		MSG_DEBUG("msgInfo.msgText : %s", msgInfo.msgText);
@@ -723,7 +723,7 @@ void Sms3gpp2EventHandler::handleCbMsgIncoming(TapiHandle *handle, sms_3gpp2_tra
 	MSG_DEBUG("msgInfo.displayTime : %s", ctime(&msgInfo.displayTime));
 	MSG_DEBUG("msgInfo.msgPort.valid : %d", msgInfo.msgPort.valid);
 	MSG_DEBUG("msgInfo.encodeType : %d", msgInfo.encodeType);
-	MSG_DEBUG("msgInfo.dataSize : %d", msgInfo.dataSize);
+	MSG_DEBUG("msgInfo.dataSize : %zu", msgInfo.dataSize);
 	MSG_DEBUG("msgInfo.msgId : %d", msgInfo.msgId);
 
 	if (msgInfo.bTextSms == true) {
diff --git a/plugin/sms_plugin/3gpp2/Sms3gpp2WapPushHandler.cpp b/plugin/sms_plugin/3gpp2/Sms3gpp2WapPushHandler.cpp
index 9c92c99..ecec003 100755
--- a/plugin/sms_plugin/3gpp2/Sms3gpp2WapPushHandler.cpp
+++ b/plugin/sms_plugin/3gpp2/Sms3gpp2WapPushHandler.cpp
@@ -1611,7 +1611,7 @@ void Sms3gpp2WapPushHandler::handleSLMessage(char* pPushBody, int PushBodyLen, b
 
 	msgInfo.dataSize = sizeof(pushMsg);
 
-	MSG_DEBUG("dataSize : %d", msgInfo.dataSize);
+	MSG_DEBUG("dataSize : %zu", msgInfo.dataSize);
 
 	/* Add WAP Push Msg into DB */
 	err = SmsPluginStorage::instance()->checkMessage(&msgInfo);
@@ -3225,11 +3225,11 @@ void Sms3gpp2WapPushHandler::wspHeaderDecodeAuth(unsigned long fieldValueLen, un
 	/* skip 'basic' code */
 	iField++;
 	memset(authStr, 0x00, sizeof(authStr));
-	snprintf(authStr, sizeof(authStr), "%%%ds", sizeof(userId));
+	snprintf(authStr, sizeof(authStr), "%%%zus", sizeof(userId));
 	sscanf((char*)(fieldValue + iField), authStr, userId);
 	iField = iField + AcStrlen((char*)userId) + 1;
 	memset(authStr, 0x00, sizeof(authStr));
-	snprintf(authStr, sizeof(authStr), "%%%ds", sizeof(passWd));
+	snprintf(authStr, sizeof(authStr), "%%%zus", sizeof(passWd));
 	sscanf((char*)(fieldValue + iField), authStr, passWd);
 	iField = iField + AcStrlen((char*)userId) + 1;
 	int wrn = snprintf((char*)*pDecodedString, (sizeof(char)*WSP_STANDARD_STR_LEN_MAX*2), "basic %s/%s", userId, passWd);
@@ -3256,7 +3256,7 @@ void Sms3gpp2WapPushHandler::wspHeaderDecodeChallenge(unsigned long fieldValueLe
 	/* skip 'basic' code */
 	iField++;
 	memset(authStr, 0x00, sizeof(authStr));
-	snprintf(authStr, sizeof(authStr), "%%%ds", sizeof(userId));
+	snprintf(authStr, sizeof(authStr), "%%%zus", sizeof(userId));
 	sscanf((char*)(fieldValue + iField), authStr, userId);
 	iField = iField + AcStrlen((char*)userId) + 1;
 
diff --git a/plugin/sms_plugin/SmsPluginDSHandler.cpp b/plugin/sms_plugin/SmsPluginDSHandler.cpp
index 88c1d77..f14e82b 100755
--- a/plugin/sms_plugin/SmsPluginDSHandler.cpp
+++ b/plugin/sms_plugin/SmsPluginDSHandler.cpp
@@ -114,7 +114,7 @@ TapiHandle *SmsPluginDSHandler::getTelHandle(int simIndex)
 
 		return tapiHandles[tapiHandles.size() - 1].first;
 	} else {
-		MSG_ERR("Error tapiHandles.size [%d]", tapiHandles.size());
+		MSG_ERR("Error tapiHandles.size [%zu]", tapiHandles.size());
 		return NULL;
 	}
 }