3.0 migrationsubmit/tizen_mobile/20150406.133152

Change-Id: I062afeca56ac25ca31de6653ede0c4464198f2b9
Signed-off-by: Sangkoo Kim <sangkoo.kim@samsung.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/plugin/sms_plugin/SmsPluginCallback.cpp b/plugin/sms_plugin/SmsPluginCallback.cpp
index 202c8be..e0fa5c6 100755
--- a/plugin/sms_plugin/SmsPluginCallback.cpp
+++ b/plugin/sms_plugin/SmsPluginCallback.cpp
@@ -1253,7 +1253,7 @@ void TapiEventNetworkStatusChange(TapiHandle *handle, const char *noti_id, void
 
 	TelNetworkServiceType_t *type = (TelNetworkServiceType_t *)data;
 
-	MSG_INFO("network status type [%d], simIndex [%d]", *type, (int)user_data);
+	MSG_INFO("network status type [%d]", *type);
 
 	if (*type > TAPI_NETWORK_SERVICE_TYPE_SEARCH) {
 		SmsPluginEventHandler::instance()->handleResendMessage(); // Call Event Handler
@@ -1322,7 +1322,7 @@ void SmsPluginCallback::registerEvent()
 			MSG_DEBUG("tel_register_noti_event is failed : [%s]", TAPI_NOTI_SAT_MO_SM_CONTROL_RESULT);
 		if (tel_register_noti_event(pTapiHandle, TAPI_NOTI_SIM_STATUS, TapiEventSimStatusChange, NULL) != TAPI_API_SUCCESS)
 			MSG_DEBUG("tel_register_noti_event is failed : [%s]", TAPI_NOTI_SIM_STATUS);
-		if (tel_register_noti_event(pTapiHandle, TAPI_PROP_NETWORK_SERVICE_TYPE, TapiEventNetworkStatusChange, (void*)simIndex) != TAPI_API_SUCCESS)
+		if (tel_register_noti_event(pTapiHandle, TAPI_PROP_NETWORK_SERVICE_TYPE, TapiEventNetworkStatusChange, NULL) != TAPI_API_SUCCESS)
 			MSG_DEBUG("tel_register_noti_event is failed : [%s]", TAPI_PROP_NETWORK_SERVICE_TYPE);
 		if (tel_register_noti_event(pTapiHandle, TAPI_NOTI_SIM_REFRESHED, TapiEventSimRefreshed, NULL) != TAPI_API_SUCCESS)
 			MSG_DEBUG("tel_register_noti_event is failed : [%s]", TAPI_NOTI_SIM_REFRESHED);
diff --git a/plugin/sms_plugin/SmsPluginStorage.cpp b/plugin/sms_plugin/SmsPluginStorage.cpp
index 0977ea4..33eafa4 100755
--- a/plugin/sms_plugin/SmsPluginStorage.cpp
+++ b/plugin/sms_plugin/SmsPluginStorage.cpp
@@ -768,7 +768,7 @@ void* SmsPluginStorage::class2_thread(void *data)
 	}
 
 	MSG_END();
-	return (void *)err;
+	return NULL;
 }
 
 
diff --git a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
index e568313..5e47956 100755
--- a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
+++ b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
@@ -3401,11 +3401,11 @@ void SmsPluginWapPushHandler::wspHeaderDecodeAuth(unsigned long fieldValueLen, u
 	/* skip 'basic' code */
 	iField++;
 	memset(authStr, 0x00, sizeof(authStr));
-	snprintf(authStr, sizeof(authStr), "%%%ds", sizeof(userId));
+	snprintf(authStr, sizeof(authStr), "%%%lus", 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), "%%%lus", sizeof(passWd));
 	sscanf( (char*)(fieldValue + iField), authStr, passWd );
 	iField = iField + AcStrlen( (char*)userId ) + 1;
 	snprintf( (char*)*pDecodedString, (sizeof(char)*WSP_STANDARD_STR_LEN_MAX*2), "basic %s/%s", userId, passWd );
@@ -3430,7 +3430,7 @@ void SmsPluginWapPushHandler::wspHeaderDecodeChallenge(unsigned long fieldValueL
 	/* skip 'basic' code */
 	iField++;
 	memset(authStr, 0x00, sizeof(authStr));
-	snprintf(authStr, sizeof(authStr), "%%%ds", sizeof(userId));
+	snprintf(authStr, sizeof(authStr), "%%%lus", sizeof(userId));
 	sscanf( (char*)(fieldValue + iField), authStr, userId );
 	iField = iField + AcStrlen( (char*)userId ) + 1;