3.0 migration

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

diff --git a/framework/transaction-manager/MsgCmdHandlerTransport.cpp b/framework/transaction-manager/MsgCmdHandlerTransport.cpp
index 426140b..e08ebac 100755 (executable)
--- a/framework/transaction-manager/MsgCmdHandlerTransport.cpp
+++ b/framework/transaction-manager/MsgCmdHandlerTransport.cpp
@@ -406,7 +406,7 @@ int MsgSentStatusHandler(const MSG_CMD_S *pCmd, char **ppEvent)
 
        ret[0] = pStatus->reqId;
        ret[1] = pStatus->status;
-       ret[2] = prxInfo->handleAddr;
+       ret[2] = (unsigned int)prxInfo->handleAddr;
 
        // Make Event Data for APP
        int eventSize = MsgMakeEvent(ret, sizeof(ret), MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);
@@ -684,7 +684,7 @@ __BYPASS_UPDATE:
 
                                ret[0] = reqID;
                                ret[1] = msgInfo.networkStatus;
-                               ret[2] = prxInfo->handleAddr;
+                               ret[2] = (unsigned int)prxInfo->handleAddr;
 
                                // Make Event Data for APP
                                eventsize = MsgMakeEvent(ret, sizeof(ret), MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);

diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h
index 8b6db87..26a592f 100755 (executable)
--- a/include/common/MsgInternalTypes.h
+++ b/include/common/MsgInternalTypes.h
@@ -419,7 +419,7 @@ typedef struct
 typedef struct
 {
        int                                             listenerFd;             /**< Rx fd for status cnf */
-       unsigned int                    handleAddr;             /**< Handle address for status cnf */
+       void*                                   handleAddr;             /**< Handle address for status cnf */
        msg_message_id_t                sentMsgId;              /**< The ID of a sent message for updating message status */
 } MSG_PROXY_INFO_S;
 

diff --git a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
index 5e47956..fb02f6e 100755 (executable)
--- 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), "%%%lus", sizeof(userId));
+       snprintf(authStr, sizeof(authStr), "%%%us", sizeof(userId));
        sscanf((char*)(fieldValue + iField), authStr, userId );
        iField = iField + AcStrlen( (char*)userId ) + 1;
        memset(authStr, 0x00, sizeof(authStr));
-       snprintf(authStr, sizeof(authStr), "%%%lus", sizeof(passWd));
+       snprintf(authStr, sizeof(authStr), "%%%us", 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), "%%%lus", sizeof(userId));
+       snprintf(authStr, sizeof(authStr), "%%%us", sizeof(userId));
        sscanf( (char*)(fieldValue + iField), authStr, userId );
        iField = iField + AcStrlen( (char*)userId ) + 1;
 

diff --git a/proxy/MsgHandleTransport.cpp b/proxy/MsgHandleTransport.cpp
index b62bbc2..a23ee76 100755 (executable)
--- a/proxy/MsgHandleTransport.cpp
+++ b/proxy/MsgHandleTransport.cpp
@@ -118,7 +118,7 @@ msg_error_t MsgHandle::submitReq(MSG_REQUEST_S* pReq)
 
        chInfo.listenerFd = MsgProxyListener::instance()->getRemoteFd();
 
-       chInfo.handleAddr = (unsigned int) this;
+       chInfo.handleAddr = (void *)this;
 
        /* Allocate Memory to Command Data */
        char* encodedData = NULL;

diff --git a/proxy/MsgProxyListener.cpp b/proxy/MsgProxyListener.cpp
index 0e5f181..d744675 100755 (executable)
--- a/proxy/MsgProxyListener.cpp
+++ b/proxy/MsgProxyListener.cpp
@@ -210,7 +210,7 @@ bool MsgProxyListener::regSentStatusEventCB(MsgHandle* pMsgHandle, msg_sent_stat
 
        for (; it != sentStatusCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfSentStatusCB == pfSentStatus) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfSentStatusCB == pfSentStatus) {
                        MSG_DEBUG("msg_sent_status_cb() callback : [%p] is already registered!!!", pfSentStatus);
                        return false;
                }
@@ -232,7 +232,7 @@ bool MsgProxyListener::regMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_sms_
 
        for (; it != newMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->port == port && it->pfIncomingCB == pfNewMessage) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->port == port && it->pfIncomingCB == pfNewMessage) {
                        MSG_DEBUG("msg_sms_incoming_cb() callback : Port Number [%d] is already registered!!!", port);
                        return false;
                }
@@ -254,7 +254,7 @@ bool MsgProxyListener::regMMSConfMessageIncomingEventCB(MsgHandle* pMsgHandle, m
 
        for (; it != newMMSConfMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfMMSConfIncomingCB == pfNewMMSConfMessage) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfMMSConfIncomingCB == pfNewMMSConfMessage) {
 
                        if(pAppId == NULL) {
                                MSG_DEBUG("msg_mms_conf_msg_incoming_cb() callback is already registered!!!");
@@ -285,7 +285,7 @@ bool MsgProxyListener::regPushMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_
 
        for (; it != newPushMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfPushIncomingCB == pfNewPushMessage) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfPushIncomingCB == pfNewPushMessage) {
 
                        if(pAppId == NULL) {
                                MSG_DEBUG("msg_push_msg_incoming_cb() callback is already registered!!!");
@@ -315,7 +315,7 @@ bool MsgProxyListener::regCBMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_cb
 
        for (; it != newCBMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfCBIncomingCB == pfNewCBMessage) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfCBIncomingCB == pfNewCBMessage) {
                        MSG_DEBUG("msg_CB_incoming_cb() callback : [%p] is already registered!!!", pfNewCBMessage);
                         it->bsave = bSave;
                         it->userParam = pUserParam;
@@ -339,7 +339,7 @@ bool MsgProxyListener::regReportMsgIncomingCB(MsgHandle* pMsgHandle, msg_report_
 
        for (; it != reportMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfReportMsgIncomingCB == pfReportMessage) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfReportMsgIncomingCB == pfReportMessage) {
                        MSG_DEBUG("msg_report_msg_incoming_cb() callback : [%p] is already registered!!!", pfReportMessage);
                         it->userParam = pUserParam;
                        return false;
@@ -362,7 +362,7 @@ bool MsgProxyListener::regSyncMLMessageIncomingEventCB(MsgHandle* pMsgHandle, ms
 
        for (; it != newSyncMLMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfSyncMLIncomingCB == pfNewSyncMLMessage) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfSyncMLIncomingCB == pfNewSyncMLMessage) {
                        MSG_DEBUG("msg_syncml_msg_incoming_cb() callback : [%p] is already registered!!!", pfNewSyncMLMessage);
                        return false;
                }
@@ -384,7 +384,7 @@ bool MsgProxyListener::regLBSMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_l
 
        for (; it != newLBSMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfLBSMsgIncoming == pfNewLBSMsgIncoming) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfLBSMsgIncoming == pfNewLBSMsgIncoming) {
                        MSG_DEBUG("msg_lbs_msg_incoming_cb() callback : [%p] is already registered!!!", pfNewLBSMsgIncoming);
                        return false;
                }
@@ -406,7 +406,7 @@ bool MsgProxyListener::regSyncMLMessageOperationEventCB(MsgHandle* pMsgHandle, m
 
        for (; it != operationSyncMLMessageCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfSyncMLOperationCB == pfSyncMLMessageOperation) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfSyncMLOperationCB == pfSyncMLMessageOperation) {
                        MSG_DEBUG("msg_syncml_msg_incoming_cb() callback : [%p] is already registered!!!", pfSyncMLMessageOperation);
                        return false;
                }
@@ -428,7 +428,7 @@ bool MsgProxyListener::regStorageChangeEventCB(MsgHandle* pMsgHandle, msg_storag
 
        for (; it != storageChangeCBList.end(); it++)
        {
-               if (it->hAddr == pMsgHandle && it->pfStorageChangeCB == pfStorageChangeOperation) {
+               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfStorageChangeCB == pfStorageChangeOperation) {
                        MSG_DEBUG("msg_storage_change_cb() callback : [%p] is already registered!!!", pfStorageChangeOperation);
                        return false;
                }
@@ -453,7 +453,7 @@ void MsgProxyListener::clearListOfClosedHandle(MsgHandle* pMsgHandle)
 
        for (; it != sentStatusCBList.end(); )
        {
-               if (it->hAddr == pMsgHandle)
+               if ((MsgHandle*)it->hAddr == pMsgHandle)
                {
                        sentStatusCBList.erase(it++);
 
@@ -626,7 +626,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != sentStatusCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_sent_status_cb pfunc = it->pfSentStatusCB;
 
@@ -668,7 +668,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != matchList.end(); it++ )
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        MSG_MESSAGE_HIDDEN_S msgHidden = {0,};
 
@@ -785,7 +785,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != matchList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        MSG_MESSAGE_HIDDEN_S msgHidden = {0,};
 
@@ -870,7 +870,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newSyncMLMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_syncml_msg_incoming_cb pfunc = it->pfSyncMLIncomingCB;
 
@@ -891,7 +891,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newLBSMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_lbs_msg_incoming_cb pfunc = it->pfLBSMsgIncoming;
 
@@ -919,7 +919,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != operationSyncMLMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_syncml_msg_operation_cb pfunc = it->pfSyncMLOperationCB;
 
@@ -953,7 +953,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != storageChangeCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_storage_change_cb pfunc = it->pfStorageChangeCB;
 
@@ -975,7 +975,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newCBMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
                        msg_struct_s msg = {0,};
 
                        msg.type = MSG_STRUCT_CB_MSG;
@@ -1001,7 +1001,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newPushMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_push_msg_incoming_cb pfunc = it->pfPushIncomingCB;
 
@@ -1036,7 +1036,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != reportMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = it->hAddr;
+                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
 
                        msg_report_msg_incoming_cb pfunc = it->pfReportMsgIncomingCB;