From: chakradhar Date: Wed, 12 Dec 2018 11:59:49 +0000 (+0530) Subject: resolved dlog errors X-Git-Tag: submit/tizen/20181214.061228^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8d5468d2a6a78dc9468ee23de51df7d6f60b21c;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git resolved dlog errors Change-Id: I313b4adf918fb9e38445524a1c3886c1a2c7c140 --- diff --git a/externals/MsgNotificationWrapper.cpp b/externals/MsgNotificationWrapper.cpp index 5660448..13129fb 100755 --- a/externals/MsgNotificationWrapper.cpp +++ b/externals/MsgNotificationWrapper.cpp @@ -128,7 +128,7 @@ msg_error_t MsgInsertNotification(MSG_MESSAGE_INFO_S *msg_info) err = MsgAddNotification(noti_type, msg_info); break; default: - MSG_DEBUG("No matching type [%d]"); + MSG_DEBUG("No matching type "); break; } diff --git a/framework/setting-handler/MsgSettingHandler.cpp b/framework/setting-handler/MsgSettingHandler.cpp index 9c9d931..410cd81 100755 --- a/framework/setting-handler/MsgSettingHandler.cpp +++ b/framework/setting-handler/MsgSettingHandler.cpp @@ -430,7 +430,7 @@ msg_error_t MsgSetSMSCList(const MSG_SETTING_S *pSetting, bool bSetSim) addrLen = strlen(pSetting->option.smscList.smscData[index].smscAddr.address); if (addrLen > SMSC_ADDR_MAX) { - MSG_DEBUG("SMSC address is too long [%d]", strlen(pSetting->option.smscList.smscData[index].smscAddr.address)); + MSG_DEBUG("SMSC address is too long [%lu]", strlen(pSetting->option.smscList.smscData[index].smscAddr.address)); return MSG_ERR_SET_SIM_SET; } else if (addrLen < 2) { MSG_DEBUG("SMSC address is too short [%d]", addrLen); diff --git a/framework/storage-handler/MsgStorageManager.cpp b/framework/storage-handler/MsgStorageManager.cpp index f81d0e2..0f53a96 100755 --- a/framework/storage-handler/MsgStorageManager.cpp +++ b/framework/storage-handler/MsgStorageManager.cpp @@ -924,7 +924,7 @@ msg_error_t MsgStoRestoreMessage(const char *filepath, msg_id_list_s **result_id break; case VMSG_TYPE_SUBJECT : { - MSG_DEBUG("subject length is [%d].", strlen(pObject->pszValue[0])); + MSG_DEBUG("subject length is [%lu].", strlen(pObject->pszValue[0])); if(strlen(pObject->pszValue[0]) > 0) { strncpy(msgInfo.subject, pObject->pszValue[0], MAX_SUBJECT_LEN); diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp index c3dcf2b..04ab1fc 100755 --- a/framework/storage-handler/MsgStorageMessage.cpp +++ b/framework/storage-handler/MsgStorageMessage.cpp @@ -2110,7 +2110,7 @@ msg_error_t MsgStoGetMessage(msg_message_id_t msgId, MSG_MESSAGE_INFO_S *pMsg, M return MSG_ERR_STORAGE_ERROR; } - MSG_SEC_DEBUG("Save Message Data into file : size[%d] name[%s]\n", pMsg->dataSize, fileName); + MSG_SEC_DEBUG("Save Message Data into file : size[%lu] name[%s]\n", pMsg->dataSize, fileName); if (MsgWriteIpcFile(fileName, msgData, pMsg->dataSize) == false) { dbHandle->finalizeQuery(); @@ -2209,7 +2209,7 @@ msg_error_t MsgStoGetMessage(msg_message_id_t msgId, MSG_MESSAGE_INFO_S *pMsg, M } return MSG_ERR_STORAGE_ERROR; } - MSG_SEC_DEBUG("Save Message Data into file : size[%d] name[%s]\n", pMsg->dataSize, tempFileName); + MSG_SEC_DEBUG("Save Message Data into file : size[%lu] name[%s]\n", pMsg->dataSize, tempFileName); if (MsgWriteIpcFile(tempFileName, pDestMsg, pMsg->dataSize) == false) { if(pDestMsg) { @@ -2644,7 +2644,7 @@ msg_error_t MsgStoGetSmsReportStatus(msg_message_id_t msgId, int *count, MSG_REP report_status[i].status = dbHandle->getColumnToInt(index++); report_status[i].statusTime = (time_t)dbHandle->getColumnToInt(index++); - MSG_SEC_DEBUG("(%d/%d) address = %s, report_type = %d, report_status = %d, report_time = %d", i+1, rowCnt, report_status[i].addressVal, report_status[i].type, report_status[i].status, report_status[i].statusTime); + MSG_SEC_DEBUG("(%d/%d) address = %s, report_type = %d, report_status = %d, report_time = %ld", i+1, rowCnt, report_status[i].addressVal, report_status[i].type, report_status[i].status, report_status[i].statusTime); } *pReportStatus = report_status; @@ -2704,7 +2704,7 @@ msg_error_t MsgStoGetMmsReportStatus(msg_message_id_t msgId, int *count, MSG_REP report_status[i].status = dbHandle->getColumnToInt(index++); report_status[i].statusTime = (time_t)dbHandle->getColumnToInt(index++); - MSG_DEBUG("(%d/%d) addr = %s, report_type = %d, report_status = %d, report_time = %d", i+1, rowCnt, report_status[i].addressVal, report_status[i].type, report_status[i].status, report_status[i].statusTime); + MSG_DEBUG("(%d/%d) addr = %s, report_type = %d, report_status = %d, report_time = %ld", i+1, rowCnt, report_status[i].addressVal, report_status[i].type, report_status[i].status, report_status[i].statusTime); } *pReportStatus = report_status; diff --git a/framework/storage-handler/MsgStorageUtil.cpp b/framework/storage-handler/MsgStorageUtil.cpp index 5dcec40..ca9393e 100755 --- a/framework/storage-handler/MsgStorageUtil.cpp +++ b/framework/storage-handler/MsgStorageUtil.cpp @@ -214,7 +214,7 @@ msg_error_t MsgStoCleanAbnormalMmsData() dbHandle->getColumnToString(index++, MSG_FILEPATH_LEN_MAX, filePath); if(strlen(filePath) > 1) { - MSG_DEBUG("strlen(filePath) [%d]", strlen(filePath)); + MSG_DEBUG("strlen(filePath) [%lu]", strlen(filePath)); MSG_SEC_DEBUG("filePath [%s]", filePath); if(MsgGetFileSize(filePath) < 0) { @@ -489,9 +489,9 @@ msg_error_t MsgStoAddWAPMsg(MSG_MESSAGE_INFO_S *pMsgInfo) MSG_DEBUG("check pushMsg data"); MSG_DEBUG("pushMsg.action : [%d]", pushMsg.action); - MSG_DEBUG("pushMsg.received : [%d]", pushMsg.received); - MSG_DEBUG("pushMsg.created : [%d]", pushMsg.created); - MSG_DEBUG("pushMsg.expires : [%d]", pushMsg.expires); + MSG_DEBUG("pushMsg.received : [%lu]", pushMsg.received); + MSG_DEBUG("pushMsg.created : [%lu]", pushMsg.created); + MSG_DEBUG("pushMsg.expires : [%lu]", pushMsg.expires); MSG_SEC_DEBUG("pushMsg.id : [%s]", pushMsg.id); MSG_DEBUG("pushMsg.href : [%s]", pushMsg.href); MSG_DEBUG("pushMsg.contents : [%s]", pushMsg.contents); diff --git a/framework/transaction-manager/MsgCmdHandlerTransport.cpp b/framework/transaction-manager/MsgCmdHandlerTransport.cpp index 47de67e..3b2a8de 100755 --- a/framework/transaction-manager/MsgCmdHandlerTransport.cpp +++ b/framework/transaction-manager/MsgCmdHandlerTransport.cpp @@ -440,7 +440,7 @@ int MsgSentStatusHandler(const MSG_CMD_S *pCmd, char **ppEvent) return MsgMakeEvent(NULL, 0, MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent); } - MSG_DEBUG("REQID %d, listenerFD %d, handleAddr %x, msgId %d", pStatus->reqId, prxInfo->listenerFd, prxInfo->handleAddr, prxInfo->sentMsgId); + MSG_DEBUG("REQID %d, listenerFD %d, handleAddr %lu, msgId %d", pStatus->reqId, prxInfo->listenerFd, prxInfo->handleAddr, prxInfo->sentMsgId); /* if APP send and quit(not exist at this time), don't send the data up. */ if (prxInfo->handleAddr == 0) { @@ -710,7 +710,7 @@ int MsgIncomingMMSConfMsgHandler(const MSG_CMD_S *pCmd, char **ppEvent) javamms_list& listenerList = MsgTransactionManager::instance()->getJavaMMSList(); javamms_list::iterator it = listenerList.begin(); - MSG_DEBUG("listenerList size:%d ", listenerList.size()); + MSG_DEBUG("listenerList size:%lu ", listenerList.size()); if (msgInfo.networkStatus == MSG_NETWORK_SEND_FAIL && msgInfo.msgType.subType == MSG_SENDREQ_MMS) { for ( ; it != listenerList.end() ; it++) { diff --git a/framework/transaction-manager/MsgTransManager.cpp b/framework/transaction-manager/MsgTransManager.cpp index e56cff4..f459ae9 100755 --- a/framework/transaction-manager/MsgTransManager.cpp +++ b/framework/transaction-manager/MsgTransManager.cpp @@ -295,7 +295,7 @@ void MsgTransactionManager::insertSentMsg(int reqId, MSG_PROXY_INFO_S* pPrxInfo) if (pPrxInfo == NULL) THROW(MsgException::SENT_STATUS_ERROR, "Input Parameter is NULL"); - MSG_DEBUG("msg for submit: reqId %d listenerFd %d handleAddr %x", reqId, pPrxInfo->listenerFd, pPrxInfo->handleAddr); + MSG_DEBUG("msg for submit: reqId %d listenerFd %d handleAddr %lu", reqId, pPrxInfo->listenerFd, pPrxInfo->handleAddr); MsgMutexLocker lock(mx); diff --git a/manager/src/msg-manager-notification.cpp b/manager/src/msg-manager-notification.cpp index 3a9ec57..78dc161 100644 --- a/manager/src/msg-manager-notification.cpp +++ b/manager/src/msg-manager-notification.cpp @@ -3389,7 +3389,7 @@ void MsgMgrSoundSetRepeatAlarm() break; } - MSG_MGR_DEBUG("nRepeatTime = %d", nRepeatTime); + MSG_MGR_DEBUG("nRepeatTime = %ld", nRepeatTime); if (nRepeatTime > 0) { if (g_alarmId > 0) { diff --git a/mapi/msg_transport.cpp b/mapi/msg_transport.cpp index 0b61974..ac709cd 100755 --- a/mapi/msg_transport.cpp +++ b/mapi/msg_transport.cpp @@ -338,7 +338,7 @@ static void sent_status_cb_func(msg_handle_t handle, msg_struct_t sent_status, v static int msg_send_single_sms(const char *phone_num, const char *sms_text, msg_simple_sent_status_cb cb, void *user_param) { if (phone_num == NULL || sms_text == NULL || cb == NULL) { - MSG_SEC_DEBUG("Invalid parameter [%s] [%s] [%s]", phone_num, sms_text, cb); + MSG_SEC_DEBUG("Invalid parameter [%s] [%s] [%p]", phone_num, sms_text, cb); return MSG_ERR_INVALID_PARAMETER; } @@ -459,7 +459,7 @@ EXPORT_API int msg_sms_send(const char *phone_num_list, const char *sms_text, ms CHECK_MSG_SUPPORTED(MSG_TELEPHONY_SMS_FEATURE); if (phone_num_list == NULL || sms_text == NULL || cb == NULL) { - MSG_SEC_DEBUG("Invalid parameter [%s] [%s] [%s]", phone_num_list, sms_text, cb); + MSG_SEC_DEBUG("Invalid parameter [%s] [%s] [%p]", phone_num_list, sms_text, cb); return MSG_ERR_INVALID_PARAMETER; } @@ -513,7 +513,7 @@ EXPORT_API int msg_sms_send_message(msg_handle_t handle, msg_struct_t req) MSG_MESSAGE_HIDDEN_S *reqmsg = (MSG_MESSAGE_HIDDEN_S*)msg_s->data; if (reqmsg->dataSize <= 0) { - MSG_FATAL("msg size is invalid : [%d]", reqmsg->dataSize); + MSG_FATAL("msg size is invalid : [%lu]", reqmsg->dataSize); return MSG_ERR_INVALID_PARAMETER; } diff --git a/plugin/mms_plugin/MmsPluginCodecCommon.cpp b/plugin/mms_plugin/MmsPluginCodecCommon.cpp index 30d07a7..f00f85b 100755 --- a/plugin/mms_plugin/MmsPluginCodecCommon.cpp +++ b/plugin/mms_plugin/MmsPluginCodecCommon.cpp @@ -659,7 +659,7 @@ bool MsgEncode2Base64(void *pSrc, unsigned long srcLen, unsigned long *len, unsi if (((unsigned long)(d - ret)) != *len) { *len = d - ret; - MSG_DEBUG("base64 encoding length = %d \n", *len); + MSG_DEBUG("base64 encoding length = %lu \n", *len); } return true; @@ -696,7 +696,7 @@ int extract_encoded_word_param(char *encoded_word, char **charset, char **encod if (char_set) { strncpy(char_set, (char*)((start_ptr + 2)), q1_ptr - (start_ptr + 2)); - MSG_DEBUG("character set [%s][%d]", char_set, strlen(char_set)); + MSG_DEBUG("character set [%s][%lu]", char_set, strlen(char_set)); } else { MSG_DEBUG("fail to calloc"); goto __CATCH; @@ -726,7 +726,7 @@ int extract_encoded_word_param(char *encoded_word, char **charset, char **encod goto __CATCH; strncpy(l_encoded_text, (char*)(q2_ptr + 1), end_ptr - q2_ptr -1); - MSG_DEBUG("encoded text [%s][%d]", l_encoded_text, strlen(l_encoded_text)); + MSG_DEBUG("encoded text [%s][%lu]", l_encoded_text, strlen(l_encoded_text)); } else { MSG_DEBUG("encoded text is NULL"); goto __CATCH; @@ -816,7 +816,7 @@ char *MsgDecodeText(const char *pOri) } if (strcasecmp(encoding, "B") == 0) { - MSG_DEBUG("Base64 encoded text [%s][%d]", encoded_text, strlen(encoded_text)); + MSG_DEBUG("Base64 encoded text [%s][%lu]", encoded_text, strlen(encoded_text)); decoded_text = (char *)MsgDecodeBase64((unsigned char *)encoded_text, strlen(encoded_text), (ULONG *)&decoded_len); @@ -824,14 +824,14 @@ char *MsgDecodeText(const char *pOri) char *result_text = NULL; int result_text_len = 0; - MSG_DEBUG("Base64 decoded text [%s][%d], outlen [%d]", decoded_text, strlen(decoded_text), decoded_len); + MSG_DEBUG("Base64 decoded text [%s][%lu], outlen [%d]", decoded_text, strlen(decoded_text), decoded_len); if (MmsPluginTextConvert("UTF-8", charset, decoded_text, decoded_len, &result_text, &result_text_len) == false) { MSG_DEBUG("MmsPluginTextConvert Fail"); } if (result_text) { - MSG_DEBUG("Text convert result [%s][%d]", result_text, strlen(result_text)); + MSG_DEBUG("Text convert result [%s][%lu]", result_text, strlen(result_text)); result_string.append(result_text, result_text_len); @@ -848,19 +848,19 @@ char *MsgDecodeText(const char *pOri) char *result_text = NULL; int result_text_len = 0; - MSG_DEBUG("Qprint encoded text [%s][%d]", encoded_text, strlen(encoded_text)); + MSG_DEBUG("Qprint encoded text [%s][%lu]", encoded_text, strlen(encoded_text)); decoded_text = (char *)MsgDecodeQuotePrintable((unsigned char *)encoded_text, strlen(encoded_text), (ULONG *)&decoded_len); if (decoded_text && decoded_len > 0) { - MSG_DEBUG("Qprint decoded text [%s][%d], outlen [%d]", decoded_text, strlen(decoded_text), decoded_len); + MSG_DEBUG("Qprint decoded text [%s][%zu], outlen [%u]", decoded_text, strlen(decoded_text), decoded_len); if (MmsPluginTextConvert("UTF-8", charset, decoded_text, decoded_len, &result_text, &result_text_len) == false) { MSG_DEBUG("MmsPluginTextConvert Fail"); } if (result_text) { - MSG_DEBUG("Text convert result [%s][%d]", result_text, strlen(result_text)); + MSG_DEBUG("Text convert result [%s][%lu]", result_text, strlen(result_text)); result_string.append(result_text, result_text_len); diff --git a/plugin/mms_plugin/MmsPluginConnManWrapper.cpp b/plugin/mms_plugin/MmsPluginConnManWrapper.cpp index 732807b..09d2e3f 100755 --- a/plugin/mms_plugin/MmsPluginConnManWrapper.cpp +++ b/plugin/mms_plugin/MmsPluginConnManWrapper.cpp @@ -134,9 +134,9 @@ void __connection_profile_print(connection_profile_h profile) MSG_SEC_INFO("Profile Apn = [%s]", apn); ret = connection_profile_get_cellular_auth_info(profile, &auth_type, &user_name, &password); - MSG_SEC_INFO("Profile Auth Type = [%d]", &auth_type); - MSG_SEC_INFO("Profile Auth Name = [%s]", &user_name); - MSG_SEC_INFO("Profile Auth Passward = [%s]", &password); + MSG_SEC_INFO("Profile Auth Type = [%p]", &auth_type); + MSG_SEC_INFO("Profile Auth Name = [%s]", user_name); + MSG_SEC_INFO("Profile Auth Passward = [%s]", password); ret = connection_profile_get_cellular_home_url(profile, &home_url); MSG_SEC_INFO("Profile Home Url = [%s]", home_url); diff --git a/plugin/mms_plugin/MmsPluginDecode.cpp b/plugin/mms_plugin/MmsPluginDecode.cpp index 057a642..a55740c 100755 --- a/plugin/mms_plugin/MmsPluginDecode.cpp +++ b/plugin/mms_plugin/MmsPluginDecode.cpp @@ -635,7 +635,7 @@ bool MmsBinaryDecodeMsgHeader(FILE *pFile, int totalLength) goto __CATCH; } - MSG_SEC_INFO("Date = [%u][%d]", mmsHeader.date, (const time_t *)&mmsHeader.date); + MSG_SEC_INFO("Date = [%lu][%p]", mmsHeader.date, (const time_t *)&mmsHeader.date); break; case MMS_CODE_DELIVERYREPORT: @@ -763,7 +763,7 @@ bool MmsBinaryDecodeMsgHeader(FILE *pFile, int totalLength) goto __CATCH; } - MSG_SEC_INFO("X-Mms-Message-Size = [%d]", mmsHeader.msgSize); + MSG_SEC_INFO("X-Mms-Message-Size = [%lu]", mmsHeader.msgSize); break; case MMS_CODE_MSGSTATUS: @@ -815,7 +815,7 @@ bool MmsBinaryDecodeMsgHeader(FILE *pFile, int totalLength) goto __CATCH; } mmsHeader.reportAllowed = (MmsReportAllowed)MmsGetBinaryType(MmsCodeReportAllowed, (UINT16)(oneByte & 0x7F)); - MSG_SEC_INFO("X-Mms-Report-Allowed = [%d]", MmsDebugGetMmsReportAllowed(mmsHeader.reportAllowed)); + MSG_SEC_INFO("X-Mms-Report-Allowed = [%s]", MmsDebugGetMmsReportAllowed(mmsHeader.reportAllowed)); break; case MMS_CODE_SENDERVISIBILLITY: @@ -1339,7 +1339,7 @@ static bool __MmsBinaryDecodeParameter(FILE *pFile, MsgType *pMsgType, int value /* Text-value */ if (__MmsBinaryDecodeInteger(pFile, &integer, &intLen, totalLength) == true) { - MSG_DEBUG("Unsupported parameter(%d)\n", integer); + MSG_DEBUG("Unsupported parameter(%lu)\n", integer); if (__MmsBinaryDecodeCheckAndDecreaseLength(&valueLength, intLen) == false) goto __RETURN; } else { @@ -2055,7 +2055,7 @@ static bool __MmsBinaryDecodeEntries(FILE *pFile, UINT32 *npEntries, int totalLe goto __CATCH; } - MSG_INFO("Number of Entries = [%d]", *npEntries); + MSG_INFO("Number of Entries = [%lu]", *npEntries); return true; @@ -2178,7 +2178,7 @@ static bool __MmsBinaryDecodeMultipart(FILE *pFile, char *szFilePath, MsgType *p } if (__MmsBinaryDecodeEachPart(pFile, szFilePath, &(pMultipart->type), pMultipart->pBody, totalLength) == false) { - MSG_DEBUG("MmsBinaryDecodeEachPart is fail.(nEntries = %d)\n", nEntries); + MSG_DEBUG("MmsBinaryDecodeEachPart is fail.(nEntries = %lu)\n", nEntries); goto __CATCH; } @@ -3325,7 +3325,7 @@ static bool __MmsBinaryDecodeCharset(FILE *pFile, UINT32 *nCharSet, int *pCharSe } *nCharSet = MmsGetBinaryType(MmsCodeCharSet, (UINT16)integer); - MSG_DEBUG("Decoded charset MIBenum = [%d], charset enum = [%d]", integer, *nCharSet); + MSG_DEBUG("Decoded charset MIBenum = [%lu], charset enum = [%lu]", integer, *nCharSet); if (*nCharSet == MIME_UNKNOWN) { MSG_DEBUG("MmsGetBinaryType fail.."); *nCharSet = MSG_CHARSET_UNKNOWN; @@ -6082,7 +6082,7 @@ void MmsPluginDecoder::decodeMmsPdu(MmsMsg *pMsg, msg_message_id_t msgID, const memcpy(&pMsg->mmsAttrib.expiryTime, &mmsHeader.expiryTime, sizeof(MmsTimeStruct)); - MSG_DEBUG("@@@@@pMsg->mmsAttrib.deliveryTime=[%d]", pMsg->mmsAttrib.deliveryTime); + MSG_DEBUG("@@@@@pMsg->mmsAttrib.deliveryTime=[%u]", pMsg->mmsAttrib.deliveryTime.time); pMsg->mmsAttrib.msgClass = mmsHeader.msgClass; diff --git a/plugin/mms_plugin/MmsPluginEncode.cpp b/plugin/mms_plugin/MmsPluginEncode.cpp index 84e7700..7444cb8 100755 --- a/plugin/mms_plugin/MmsPluginEncode.cpp +++ b/plugin/mms_plugin/MmsPluginEncode.cpp @@ -1852,7 +1852,7 @@ static bool __MmsBinaryEncodeMsgPart(FILE *pFile, int contentType, MsgType *pTyp } gMmsEncodeCurOffset = MsgFtell(pFile); if (gMmsEncodeCurOffset < 0) { - MSG_DEBUG("MsgFtell returns negative value [%ld]", gMmsEncodeCurOffset); + MSG_DEBUG("MsgFtell returns negative value [%d]", gMmsEncodeCurOffset); goto __CATCH; } } @@ -2234,7 +2234,7 @@ static bool __MmsBinaryEncodeContentBody(FILE *pFile, MsgBody *pBody) gMmsEncodeCurOffset = MsgFtell(pFile); if (gMmsEncodeCurOffset < 0) { - MSG_DEBUG("MsgFtell returns negative value [%ld]", gMmsEncodeCurOffset); + MSG_DEBUG("MsgFtell returns negative value [%d]", gMmsEncodeCurOffset); goto __CATCH; } @@ -2251,7 +2251,7 @@ static bool __MmsBinaryEncodeContentBody(FILE *pFile, MsgBody *pBody) gMmsEncodeCurOffset = MsgFtell(pFile); if (gMmsEncodeCurOffset < 0) { - MSG_DEBUG("MsgFtell returns negative value [%ld]", gMmsEncodeCurOffset); + MSG_DEBUG("MsgFtell returns negative value [%d]", gMmsEncodeCurOffset); goto __CATCH; } } @@ -2986,7 +2986,7 @@ static bool __MmsBinaryEncodeDate(FILE *pFile, time_t inpDateSec) } } else { - MSG_DEBUG("date has a negative value (%d)", dateSec); + MSG_DEBUG("date has a negative value (%ld)", dateSec); goto __CATCH; } return true; diff --git a/plugin/mms_plugin/MmsPluginMessage.cpp b/plugin/mms_plugin/MmsPluginMessage.cpp index 773e515..7743f17 100755 --- a/plugin/mms_plugin/MmsPluginMessage.cpp +++ b/plugin/mms_plugin/MmsPluginMessage.cpp @@ -900,7 +900,7 @@ void MmsPrintMmsMsg(const MmsMsg *pMmsMsg) PRINT_KEY_VAL_STR("mms type", "Unknown"); } - PRINT_KEY_VAL_STR("mms ver", pMmsMsg->mmsAttrib.version); + PRINT_KEY_VAL_INT("mms ver", pMmsMsg->mmsAttrib.version); } int MmsUpdateMultipartList(MSG_MESSAGE_INFO_S *pMsgInfo) diff --git a/plugin/mms_plugin/MmsPluginTextConvert.cpp b/plugin/mms_plugin/MmsPluginTextConvert.cpp index 613d82d..184d860 100755 --- a/plugin/mms_plugin/MmsPluginTextConvert.cpp +++ b/plugin/mms_plugin/MmsPluginTextConvert.cpp @@ -104,7 +104,7 @@ bool MmsPluginTextConvert(const char *pToCodeSet, const char *pFromCodeset, cons } if (pDest == NULL || bytes_written == 0 || bytes_read == 0) { - MSG_DEBUG("Error in g_convert, pDest = %s, bytes_written = %d, bytes_read = %d\n", pDest, bytes_written, bytes_read); + MSG_DEBUG("Error in g_convert, pDest = %s, bytes_written = %lu, bytes_read = %lu\n", pDest, bytes_written, bytes_read); goto __CATCH; } diff --git a/plugin/sms_plugin/SmsPluginCallback.cpp b/plugin/sms_plugin/SmsPluginCallback.cpp index 72d77fa..c203580 100755 --- a/plugin/sms_plugin/SmsPluginCallback.cpp +++ b/plugin/sms_plugin/SmsPluginCallback.cpp @@ -43,7 +43,7 @@ extern bool isMemAvailable; ==================================================================================================*/ void TapiEventDeviceReady(TapiHandle *handle, const char *noti_id, void *data, void *user_data) { - MSG_DEBUG("TapiEventDeviceReady is called. : noti_id = [%d]", noti_id); + MSG_DEBUG("TapiEventDeviceReady is called. : noti_id = [%s]", noti_id); try { /* Call Event Handler */ @@ -496,8 +496,8 @@ void TapiEventGetSimMsg(TapiHandle *handle, int result, void *data, void *user_d MSG_DEBUG("msgInfo.msgType.mainType : %d", msgInfo.msgType.mainType); MSG_DEBUG("msgInfo.msgType.subType : %d", msgInfo.msgType.subType); MSG_DEBUG("msgInfo.msgType.classType : %d", msgInfo.msgType.classType); - MSG_DEBUG("msgInfo.displayTime : %d", msgInfo.displayTime); - MSG_DEBUG("msgInfo.dataSize : %d", msgInfo.dataSize); + MSG_DEBUG("msgInfo.displayTime : %ld", msgInfo.displayTime); + MSG_DEBUG("msgInfo.dataSize : %lu", msgInfo.dataSize); if (msgInfo.bTextSms == true) MSG_SEC_DEBUG("msgInfo.msgText : %s", msgInfo.msgText); else diff --git a/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp b/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp index 7f89671..d2b7098 100755 --- a/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp +++ b/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp @@ -777,7 +777,7 @@ void SmsPluginCbMsgHandler::convertCbMsgToMsginfo(SMS_CBMSG_S *pCbMsg, MSG_MESSA pMsgInfo->msgPort.srcPort = 0; pMsgInfo->displayTime = pCbMsg->recvTime; - MSG_DEBUG("recvTime is %d", pMsgInfo->displayTime); + MSG_DEBUG("recvTime is %ld", pMsgInfo->displayTime); int bufSize = pCbMsg->msgLength*2; @@ -810,7 +810,7 @@ void SmsPluginCbMsgHandler::convertCbMsgToMsginfo(SMS_CBMSG_S *pCbMsg, MSG_MESSA if (MsgCreateFileName(fileName) == false) THROW(MsgException::FILE_ERROR, "MsgCreateFileName error"); - MSG_SEC_DEBUG("Save Message Data into file : size[%d] name[%s]\n", pMsgInfo->dataSize, fileName); + MSG_SEC_DEBUG("Save Message Data into file : size[%lu] name[%s]\n", pMsgInfo->dataSize, fileName); if (MsgWriteIpcFile(fileName, tmpBuf, pMsgInfo->dataSize) == false) THROW(MsgException::FILE_ERROR, "MsgWriteIpcFile error"); @@ -859,7 +859,7 @@ void SmsPluginCbMsgHandler::convertEtwsMsgToMsginfo(SMS_CBMSG_PAGE_S *EtwsMsg, M pMsgInfo->msgPort.srcPort = 0; pMsgInfo->displayTime = EtwsMsg->pageHeader.recvTime; - MSG_DEBUG("recvTime is %d", pMsgInfo->displayTime); + MSG_DEBUG("recvTime is %ld", pMsgInfo->displayTime); MSG_DEBUG("LENGTH %d", EtwsMsg->pageLength); pMsgInfo->bTextSms = true; pMsgInfo->dataSize = EtwsMsg->pageLength; diff --git a/plugin/sms_plugin/SmsPluginConcatHandler.cpp b/plugin/sms_plugin/SmsPluginConcatHandler.cpp index 520aba0..4653f7c 100755 --- a/plugin/sms_plugin/SmsPluginConcatHandler.cpp +++ b/plugin/sms_plugin/SmsPluginConcatHandler.cpp @@ -865,7 +865,7 @@ void SmsPluginConcatHandler::convertConcatToMsginfo(const SMS_DELIVER_S *pTpdu, pMsgInfo->dataSize = textCvt->convertUCS2ToUTF8((unsigned char*)tmpBuf, bufSize, (unsigned char*)pUserData, DataSize); } - MSG_DEBUG("Data Size [%d]", pMsgInfo->dataSize); + MSG_DEBUG("Data Size [%lu]", pMsgInfo->dataSize); MSG_DEBUG("Data [%s]", tmpBuf); #ifdef MSG_FW_FOR_DEBUG @@ -889,7 +889,7 @@ printf("\n"); if (MsgCreateFileName(fileName) == false) THROW(MsgException::FILE_ERROR, "######## MsgCreateFileName Fail !!! #######"); - MSG_SEC_DEBUG("Save Message Data into file : size[%d] name[%s]\n", pMsgInfo->dataSize, fileName); + MSG_SEC_DEBUG("Save Message Data into file : size[%lu] name[%s]\n", pMsgInfo->dataSize, fileName); if (MsgWriteIpcFile(fileName, tmpBuf, pMsgInfo->dataSize) == false) THROW(MsgException::FILE_ERROR, "######## MsgWriteIpcFile Fail !!! #######"); @@ -993,7 +993,7 @@ void SmsPluginConcatHandler::convertConcatToMsginfo(const SMS_SUBMIT_S *pTpdu, c pMsgInfo->dataSize = textCvt->convertUCS2ToUTF8((unsigned char*)tmpBuf, bufSize, (unsigned char*)pUserData, DataSize); } - MSG_DEBUG("Data Size [%d]", pMsgInfo->dataSize); + MSG_DEBUG("Data Size [%lu]", pMsgInfo->dataSize); MSG_DEBUG("Data [%s]", tmpBuf); if (pMsgInfo->dataSize > MAX_MSG_TEXT_LEN) { @@ -1006,7 +1006,7 @@ void SmsPluginConcatHandler::convertConcatToMsginfo(const SMS_SUBMIT_S *pTpdu, c if (MsgCreateFileName(fileName) == false) THROW(MsgException::FILE_ERROR, "######## MsgCreateFileName Fail !!! #######"); - MSG_SEC_DEBUG("Save Message Data into file : size[%d] name[%s]\n", pMsgInfo->dataSize, fileName); + MSG_SEC_DEBUG("Save Message Data into file : size[%lu] name[%s]\n", pMsgInfo->dataSize, fileName); if (MsgWriteIpcFile(fileName, tmpBuf, pMsgInfo->dataSize) == false) THROW(MsgException::FILE_ERROR, "######## MsgWriteIpcFile Fail !!! #######"); diff --git a/plugin/sms_plugin/SmsPluginEventHandler.cpp b/plugin/sms_plugin/SmsPluginEventHandler.cpp index 3f75041..cd522e1 100755 --- a/plugin/sms_plugin/SmsPluginEventHandler.cpp +++ b/plugin/sms_plugin/SmsPluginEventHandler.cpp @@ -292,10 +292,10 @@ void SmsPluginEventHandler::handleMsgIncoming(TapiHandle *handle, SMS_TPDU_S *pT MSG_DEBUG("msgInfo.msgType.mainType : %d", msgInfo.msgType.mainType); MSG_DEBUG("msgInfo.msgType.subType : %d", msgInfo.msgType.subType); MSG_DEBUG("msgInfo.msgType.classType : %d", msgInfo.msgType.classType); - MSG_DEBUG("msgInfo.displayTime : %d", msgInfo.displayTime); + MSG_DEBUG("msgInfo.displayTime : %ld", 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 : %lu", msgInfo.dataSize); MSG_DEBUG("msgInfo.sim_idx : %d", msgInfo.sim_idx); if (msgInfo.bTextSms == true) { @@ -646,7 +646,7 @@ void SmsPluginEventHandler::convertDeliverTpduToMsginfo(const SMS_DELIVER_S *pTp MSG_DEBUG("tzname[0] [%s]", tzname[0]); MSG_DEBUG("tzname[1] [%s]", tzname[1]); - MSG_DEBUG("timezone [%d]", timezone); + MSG_DEBUG("timezone [%lu]", timezone); MSG_DEBUG("daylight [%d]", daylight); memset(displayTime, 0x00, sizeof(displayTime)); diff --git a/plugin/sms_plugin/SmsPluginParamCodec.cpp b/plugin/sms_plugin/SmsPluginParamCodec.cpp index 0b952bd..edcffce 100755 --- a/plugin/sms_plugin/SmsPluginParamCodec.cpp +++ b/plugin/sms_plugin/SmsPluginParamCodec.cpp @@ -539,7 +539,7 @@ time_t SmsPluginParamCodec::convertTime(const SMS_TIMESTAMP_S *time_stamp) MSG_DEBUG("tzname[0] [%s]", tzname[0]); MSG_DEBUG("tzname[1] [%s]", tzname[1]); - MSG_DEBUG("timezone [%d]", timezone); + MSG_DEBUG("timezone [%ld]", timezone); MSG_DEBUG("daylight [%d]", daylight); memset(displayTime, 0x00, sizeof(displayTime)); diff --git a/plugin/sms_plugin/SmsPluginSatHandler.cpp b/plugin/sms_plugin/SmsPluginSatHandler.cpp index 85ccd50..d169d03 100755 --- a/plugin/sms_plugin/SmsPluginSatHandler.cpp +++ b/plugin/sms_plugin/SmsPluginSatHandler.cpp @@ -183,7 +183,7 @@ void SmsPluginSatHandler::sendSms(TapiHandle *handle, void *pData) smsc.npi = pSmsData->address.npi; snprintf(smsc.address, sizeof(smsc.address), "%s", pSmsData->address.diallingNumber); - MSG_SEC_DEBUG("SCA TON[%d], NPI[%d], LEN[%d], ADDR[%s]", smsc.ton, smsc.npi, strlen(smsc.address), smsc.address); + MSG_SEC_DEBUG("SCA TON[%d], NPI[%d], LEN[%lu], ADDR[%s]", smsc.ton, smsc.npi, strlen(smsc.address), smsc.address); } else { /* Set SMSC Options */ SmsPluginTransport::instance()->setSmscOptions(simIndex, &smsc); diff --git a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp index 2be2099..bc9cca1 100755 --- a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp +++ b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp @@ -848,13 +848,13 @@ void SmsPluginWapPushHandler::handleWapPushMsg(const char *pUserData, int DataSi pushHeaderLen = wspRetriveUintvarDecode(pPDUTypeData, &iPDU); - MSG_DEBUG("PDUTypeDataLen [%d]", PDUTypeDataLen); - MSG_DEBUG("pushHeaderLen [%d]", pushHeaderLen); - MSG_DEBUG("iPDU [%d]", iPDU); + MSG_DEBUG("PDUTypeDataLen [%lu]", PDUTypeDataLen); + MSG_DEBUG("pushHeaderLen [%lu]", pushHeaderLen); + MSG_DEBUG("iPDU [%lu]", iPDU); wspHeaderLen = pushHeaderLen + iPDU; - MSG_DEBUG("wspBodyLen [%d]", wspBodyLen); + MSG_DEBUG("wspBodyLen [%lu]", wspBodyLen); if (wspHeaderLen > 0) { pWspHeader = new char[wspHeaderLen]; @@ -1713,9 +1713,9 @@ void SmsPluginWapPushHandler::handleSLMessage(char* pPushBody, int PushBodyLen, MSG_DEBUG("check pushMsg data"); MSG_DEBUG("pushMsg.action : [%d]", pushMsg.action); - MSG_DEBUG("pushMsg.received : [%d]", pushMsg.received); - MSG_DEBUG("pushMsg.created : [%d]", pushMsg.created); - MSG_DEBUG("pushMsg.expires : [%d]", pushMsg.expires); + MSG_DEBUG("pushMsg.received : [%lu]", pushMsg.received); + MSG_DEBUG("pushMsg.created : [%lu]", pushMsg.created); + MSG_DEBUG("pushMsg.expires : [%lu]", pushMsg.expires); MSG_SEC_DEBUG("pushMsg.id : [%s]", pushMsg.id); MSG_DEBUG("pushMsg.href : [%s]", pushMsg.href); MSG_DEBUG("pushMsg.contents : [%s]", pushMsg.contents); @@ -1752,7 +1752,7 @@ void SmsPluginWapPushHandler::handleSLMessage(char* pPushBody, int PushBodyLen, msgInfo.sim_idx = simIndex; getDisplayName(msgInfo.msgType.subType, msgInfo.addressList[0].addressVal); - MSG_DEBUG("dataSize : %d", msgInfo.dataSize); + MSG_DEBUG("dataSize : %lu", msgInfo.dataSize); /** Add WAP Push Msg into DB */ err = SmsPluginStorage::instance()->checkMessage(&msgInfo); @@ -2193,7 +2193,7 @@ unsigned long SmsPluginWapPushHandler::wspRetriveUintvarDecode(unsigned char* so decodedValue = wspDecodeUintvar(i + 1, sourceData + *currentPointer); *currentPointer = *currentPointer + i + 1; - MSG_DEBUG("wspRetriveUintvarDecode: decodedValue=%d .\n", decodedValue); + MSG_DEBUG("wspRetriveUintvarDecode: decodedValue=%lu .\n", decodedValue); return decodedValue; } @@ -2413,7 +2413,7 @@ void SmsPluginWapPushHandler::wspDecodeHeader(unsigned char* sEncodedHeader, uns /* processing normal pre-defined field decoding */ MSG_DEBUG("WspLDecodeHeader: FieldCode %X\n", fieldCode); - MSG_DEBUG("WspLDecodeHeader: fieldSize %d\n", fieldValueLen); + MSG_DEBUG("WspLDecodeHeader: fieldSize %lu\n", fieldValueLen); if ((fieldCode > wspHeaderFieldCount) && (fieldCode != 0xff)) { MSG_DEBUG("WspLDecodeHeader: unknown fieldcode %X \n", track); @@ -2486,7 +2486,7 @@ void SmsPluginWapPushHandler::wspDecodeHeader(unsigned char* sEncodedHeader, uns unsigned long i = 0; /* encoded content type length body */ unsigned long tempLen; - MSG_DEBUG("fieldValueLen: %d", fieldValueLen); + MSG_DEBUG("fieldValueLen: %lu", fieldValueLen); /* Like HTTP result state 304, it's for processing without Content type. This part doesn't defined. */ if (0 == fieldValueLen) { @@ -2545,7 +2545,7 @@ void SmsPluginWapPushHandler::wspDecodeHeader(unsigned char* sEncodedHeader, uns tempLen = AcStrlen((char*)fieldValue) + 1; strncat((char*)temper, (char*)fieldValue, (WSP_STANDARD_STR_LEN_MAX * 5)-AcStrlen((char*)temper)-1); - MSG_DEBUG("WspLDecodeHeader: Attention, Decoding Check of Content-Type\n ", tempLen); + MSG_DEBUG("WspLDecodeHeader: Attention, Decoding Check of Content-Type %lu\n ", tempLen); } /* If there is a parameter */ @@ -3008,7 +3008,7 @@ unsigned long SmsPluginWapPushHandler::wspHeaderDecodeInteger(unsigned char* dat IntLen = (data[0] > 0x04) ? 0x04:data[0]; - MSG_DEBUG("WspLHeaderDecodeInteger: input %d , length %d\n", data[0], IntLen); + MSG_DEBUG("WspLHeaderDecodeInteger: input %d , length %lu\n", data[0], IntLen); for (i = 0; i < IntLen; i++) returner.seg[IntLen-(i+1)] = data[i+1]; @@ -3071,7 +3071,7 @@ unsigned long SmsPluginWapPushHandler::wspHeaderDecodeIntegerByLength(unsigned c for (i = 0 ; i < length; i++) { returner.integer = returner.integer + (data[i] * (0x1 << ((length - (i + 1)) * 8))); - MSG_DEBUG("WspLHeaderDecodeIntegerByLength: %d \n", returner.integer); + MSG_DEBUG("WspLHeaderDecodeIntegerByLength: %lu \n", returner.integer); } return returner.integer; diff --git a/proxy/MsgHandleControl.cpp b/proxy/MsgHandleControl.cpp index 81d0dfa..58c54f9 100755 --- a/proxy/MsgHandleControl.cpp +++ b/proxy/MsgHandleControl.cpp @@ -234,7 +234,7 @@ void MsgHandle::convertMsgStruct(const MSG_MESSAGE_HIDDEN_S *pSrc, MSG_MESSAGE_I pDest->msgPort.srcPort = pSrc->srcPort; } - MSG_DEBUG("nSize = %d", pSrc->dataSize); + MSG_DEBUG("nSize = %lu", pSrc->dataSize); MSG_DEBUG("mainType = %d", pSrc->mainType); if (pSrc->mainType == MSG_SMS_TYPE) { @@ -252,7 +252,7 @@ void MsgHandle::convertMsgStruct(const MSG_MESSAGE_HIDDEN_S *pSrc, MSG_MESSAGE_I if (MsgCreateFileName(fileName) == false) THROW(MsgException::FILE_ERROR, "MsgCreateFileName error"); - MSG_SEC_DEBUG("Save pSrc->pData into file : size[%d] name[%s]", pDest->dataSize, fileName); + MSG_SEC_DEBUG("Save pSrc->pData into file : size[%lu] name[%s]", pDest->dataSize, fileName); if (MsgWriteIpcFile(fileName, (char*)pSrc->pData, pSrc->dataSize) == false) THROW(MsgException::FILE_ERROR, "MsgWriteIpcFile error"); @@ -269,7 +269,7 @@ void MsgHandle::convertMsgStruct(const MSG_MESSAGE_HIDDEN_S *pSrc, MSG_MESSAGE_I strncpy(pDest->msgText, (char*)pSrc->pData, pSrc->dataSize); } - MSG_DEBUG("pData = %s", pSrc->pData); + MSG_DEBUG("pData = %s",(char*) pSrc->pData); } else { MSG_DEBUG("pSrc->pData is NULL."); pDest->bTextSms = true; @@ -305,7 +305,7 @@ void MsgHandle::convertMsgStruct(const MSG_MESSAGE_HIDDEN_S *pSrc, MSG_MESSAGE_I snprintf(pFileNameExt, strlen("JAVA")+1, "JAVA"); } - MSG_SEC_DEBUG("Save Message Data into file : size[%d] name[%s]", pSrc->mmsDataSize, fileName); + MSG_SEC_DEBUG("Save Message Data into file : size[%zu] name[%s]", pSrc->mmsDataSize, fileName); if (MsgWriteIpcFile(fileName, (char*)pSrc->pMmsData, pSrc->mmsDataSize) == false) THROW(MsgException::FILE_ERROR, "MsgWriteIpcFile error"); @@ -437,7 +437,7 @@ void MsgHandle::convertMsgStruct(const MSG_MESSAGE_INFO_S *pSrc, MSG_MESSAGE_HID pDest->pMmsData = (void*)new char[fileSize]; memset(pDest->pMmsData, 0x00, fileSize); memcpy(pDest->pMmsData, pFileData, fileSize); - MSG_SEC_DEBUG("Get Message Data from file : size[%d] name[%s]", pDest->mmsDataSize, pSrc->msgData); + MSG_SEC_DEBUG("Get Message Data from file : size[%zu] name[%s]", pDest->mmsDataSize, pSrc->msgData); } } else { @@ -557,7 +557,7 @@ void MsgHandle::convertSendOptStruct(const MSG_SENDINGOPT_INFO_S* pSrc, MSG_SEND MSG_DEBUG("pDest->option.mmsSendOpt.priority = %d", pMms->priority); MSG_DEBUG("pDest->option.mmsSendOpt.bReadReq = %d", pMms->bReadReq); - MSG_DEBUG("pDest->option.mmsSendOpt.expiryTime = %d", pMms->expiryTime); + MSG_DEBUG("pDest->option.mmsSendOpt.expiryTime = %ld", pMms->expiryTime); } MSG_END(); diff --git a/proxy/MsgProxyListener.cpp b/proxy/MsgProxyListener.cpp index c66d09a..efec00f 100755 --- a/proxy/MsgProxyListener.cpp +++ b/proxy/MsgProxyListener.cpp @@ -1297,7 +1297,7 @@ void MsgProxyListener::resetProxyListener() handle_set::iterator it = openHandleSet.begin(); for (; it != openHandleSet.end(); it++) { - MSG_DEBUG("disconnect socket for opened handle [%p]", it); + MSG_DEBUG("disconnect socket for opened handle [%p]", *it); MsgHandle *handle = (MsgHandle *)*it; handle->disconnectSocket(); } @@ -1344,7 +1344,7 @@ void MsgProxyListener::insertOpenHandleSet(MsgHandle* pMsgHandle) handle_set::iterator it = openHandleSet.find(pMsgHandle); if (it == openHandleSet.end()) { openHandleSet.insert(pMsgHandle); - MSG_DEBUG("New handle is added. current count = [%d]", openHandleSet.size()); + MSG_DEBUG("New handle is added. current count = [%lu]", openHandleSet.size()); } } diff --git a/utils/MsgIpcSocket.cpp b/utils/MsgIpcSocket.cpp index a24eb37..3bd930f 100755 --- a/utils/MsgIpcSocket.cpp +++ b/utils/MsgIpcSocket.cpp @@ -163,7 +163,7 @@ int MsgIpcClientSocket::write(const char* buf, unsigned int len) /* send the data size first */ int n = writen((const char*)&len, sizeof(len)); if (n != sizeof(len)) { - MSG_FATAL("WARNING: write header_size[%d] not matched [%d]", n, sizeof(len)); + MSG_FATAL("WARNING: write header_size[%d] not matched [%zu]", n, sizeof(len)); return CUSTOM_SOCKET_ERROR; } @@ -263,7 +263,7 @@ int MsgIpcClientSocket::read(char** buf, unsigned int* len) MSG_FATAL("sockfd [%d] CLOSE_CONNECTION_BY_SIGNAL", sockfd); return n; } else if (n != sizeof(int)) { - MSG_FATAL("WARNING: read header_size[%d] not matched [%d]", n, sizeof(int)); + MSG_FATAL("WARNING: read header_size[%d] not matched [%zu]", n, sizeof(int)); return CUSTOM_SOCKET_ERROR; } @@ -479,7 +479,7 @@ int MsgIpcServerSocket::read(int fd, char** buf, int* len) MSG_FATAL("fd %d CLOSE_CONNECTION_BY_SIGNAL", fd); return n; } else if (n != sizeof(int)) { - MSG_FATAL("readn %d(%d)", n, sizeof(int)); + MSG_FATAL("readn %d(%zu)", n, sizeof(int)); return CUSTOM_SOCKET_ERROR; } @@ -604,7 +604,7 @@ int MsgIpcServerSocket::write(int fd, const char* buf, unsigned int len) int n = writen(fd, (const char*)&len, sizeof(len)); if (n != sizeof(len)) { - MSG_FATAL("WARNING: write header_size[%d] not matched [%d]", n, sizeof(len)); + MSG_FATAL("WARNING: write header_size[%d] not matched [%zu]", n, sizeof(len)); return CUSTOM_SOCKET_ERROR; } diff --git a/utils/MsgMmsMessage.cpp b/utils/MsgMmsMessage.cpp index 688085e..5caca09 100755 --- a/utils/MsgMmsMessage.cpp +++ b/utils/MsgMmsMessage.cpp @@ -614,7 +614,7 @@ bool _MsgMmsDeserializeMessageData(MMS_MESSAGE_DATA_S *pMsgData, const char *pDa MSG_BEGIN(); if (pMsgData == NULL || pData == NULL) { - MSG_DEBUG("param is NULL. pBody = %x, pData = %x", pMsgData, pData); + MSG_DEBUG("param is NULL. pBody = %p, pData = %s", pMsgData, pData); return false; } diff --git a/utils/MsgSerialize.cpp b/utils/MsgSerialize.cpp index df0f9fd..5a35b3d 100755 --- a/utils/MsgSerialize.cpp +++ b/utils/MsgSerialize.cpp @@ -709,7 +709,7 @@ int MsgSerializeMms(const MMS_DATA_S *pMsgData, char **pValue) offset += sizeof(MMS_MULTIPART_DATA_S); MSG_DEBUG("SMIL file path = [%s]", pMsgData->smil->szFilePath); - MSG_DEBUG("SMIL nMultipartDataLen = [%d]", pMsgData->smil->nMultipartDataLen); + MSG_DEBUG("SMIL nMultipartDataLen = [%lu]", pMsgData->smil->nMultipartDataLen); if (pMsgData->smil->pMultipartData) { memcpy(buf + offset, pMsgData->smil->pMultipartData, sizeof(char)*pMsgData->smil->nMultipartDataLen); @@ -874,7 +874,7 @@ int MsgDeserializeMmsData(char* value, int value_len, MMS_DATA_S **ppMmsData) offset += sizeof(MMS_MULTIPART_DATA_S); MSG_SEC_DEBUG("SMIL file path = [%s]", pMmsData->smil->szFilePath); - MSG_DEBUG("SMIL nMultipartDataLen = [%d]", pMmsData->smil->nMultipartDataLen); + MSG_DEBUG("SMIL nMultipartDataLen = [%lu]", pMmsData->smil->nMultipartDataLen); if (pMmsData->smil->nMultipartDataLen > 0) { pMmsData->smil->pMultipartData = (char *)calloc(1, sizeof(char)*pMmsData->smil->nMultipartDataLen); diff --git a/utils/MsgTextConvert.cpp b/utils/MsgTextConvert.cpp index ffb3e61..de888e7 100755 --- a/utils/MsgTextConvert.cpp +++ b/utils/MsgTextConvert.cpp @@ -451,7 +451,7 @@ int MsgTextConvert::convertUTF8ToGSM7bit(OUT unsigned char *pDestText, IN int ma memset(pUCS2Text, 0x00, maxUCS2Length * sizeof(WCHAR)); MSG_DEBUG("srcTextLen = %d", srcTextLen); - MSG_DEBUG("temp buffer size = %d", maxUCS2Length * sizeof(WCHAR)); + MSG_DEBUG("temp buffer size = %lu", maxUCS2Length * sizeof(WCHAR)); MSG_DEBUG("max dest Length = %d", maxLength); ucs2Length = convertUTF8ToUCS2((unsigned char*)pUCS2Text, maxUCS2Length * sizeof(WCHAR), pSrcText, srcTextLen); @@ -536,7 +536,7 @@ int MsgTextConvert::convertUTF8ToAuto(OUT unsigned char *pDestText, IN int maxLe memset(pUCS2Text, 0x00, maxUCS2Length * sizeof(WCHAR)); MSG_DEBUG("srcTextLen = %d", srcTextLen); - MSG_DEBUG("temp buffer size = %d", maxUCS2Length * sizeof(WCHAR)); + MSG_DEBUG("temp buffer size = %lu", maxUCS2Length * sizeof(WCHAR)); MSG_DEBUG("max dest Length = %d", maxLength); ucs2Length = convertUTF8ToUCS2((unsigned char*)pUCS2Text, maxUCS2Length * sizeof(WCHAR), pSrcText, srcTextLen); diff --git a/utils/MsgUtilFile.cpp b/utils/MsgUtilFile.cpp index bf8c35e..46c26e9 100755 --- a/utils/MsgUtilFile.cpp +++ b/utils/MsgUtilFile.cpp @@ -217,7 +217,7 @@ int MsgFseek(FILE *pFile, long int offset, int origin) int ret = -1; - MSG_DEBUG("[FILE] pFile [%p], offset [%d], origin [%d]", pFile, offset, origin); + MSG_DEBUG("[FILE] pFile [%p], offset [%ld], origin [%d]", pFile, offset, origin); try { ret = fseek(pFile, offset, origin); /* return 0, if success. */ @@ -238,7 +238,7 @@ size_t MsgWriteFile(const char *pData, size_t size, size_t count, FILE *pFile) size_t nWrite = 0; - MSG_DEBUG("[FILE] pData [%p], size [%d], count [%d], pFile [%p]", pData, size, count, pFile); + MSG_DEBUG("[FILE] pData [%p], size [%lu], count [%lu], pFile [%p]", pData, size, count, pFile); try { nWrite = fwrite(pData, size, count, pFile); @@ -339,7 +339,7 @@ bool MsgCreateFileName(char *pFileName) /* Create Random Number */ srandom((unsigned int)ts.tv_nsec); - MSG_DEBUG("ts.tv_nsec : %d", ts.tv_nsec); + MSG_DEBUG("ts.tv_nsec : %ld", ts.tv_nsec); /* between 1 - 1000000000 */ snprintf(pFileName, MSG_FILENAME_LEN_MAX, "MSG_%lu.DATA", random()%1000000000+1); @@ -355,7 +355,7 @@ bool MsgCreateFileName(char *pFileName) bool MsgOpenAndReadFile(const char *pFileName, char **ppData, int *pDataSize) { if (!pFileName || !ppData || !pDataSize) { - MSG_ERR("Invalid params!! pFileName=%x, ppData=%x, pDataSize=%x", pFileName, ppData, pDataSize); + MSG_ERR("Invalid params!! pFileName=%s, ppData=%s, pDataSize=%p", pFileName, *ppData, (void *)pDataSize); return false; } @@ -705,9 +705,9 @@ bool MsgWriteDataFromEncodeBuffer(FILE *pFile, char *pInBuffer, int *pPtr, int m } MSG_DEBUG("MsgWriteDataFromEncodeBuffer:"); - MSG_DEBUG("pInBuffer %x", pInBuffer); + MSG_DEBUG("pInBuffer %s", pInBuffer); MSG_DEBUG("pPtr %d", (*pPtr)); - MSG_DEBUG("before to fwite %x", pFile); + MSG_DEBUG("before to fwite %p", pFile); if (MsgWriteFile(pInBuffer, sizeof(char), (*pPtr), pFile) != (size_t)(*pPtr)) { MSG_FATAL("MsgWriteFile failed"); diff --git a/utils/MsgUtilFunction.cpp b/utils/MsgUtilFunction.cpp index 9666cc1..9f857dd 100755 --- a/utils/MsgUtilFunction.cpp +++ b/utils/MsgUtilFunction.cpp @@ -761,7 +761,7 @@ void MsgDecodeReportStatus(char *pSrc, msg_struct_list_s *report_list) report_status[i] = (msg_struct_t)report_status_item; - MSG_DEBUG("Report_type = %d, status addr = %s, status = %d, time = %d", + MSG_DEBUG("Report_type = %d, status addr = %s, status = %d, time = %ld", report_status_info->type, report_status_info->addressVal, report_status_info->status, report_status_info->statusTime); } @@ -1146,7 +1146,7 @@ msg_error_t msg_write_text_to_msg_info(MSG_MESSAGE_INFO_S *pMsgInfo, char *text) return MSG_ERR_STORAGE_ERROR; } - MSG_SEC_DEBUG("Save text into file : size[%d] name[%s]", pMsgInfo->dataSize, fileName); + MSG_SEC_DEBUG("Save text into file : size[%lu] name[%s]", pMsgInfo->dataSize, fileName); if (MsgWriteIpcFile(fileName, text, pMsgInfo->dataSize) == false) { MSG_DEBUG("MsgWriteIpcFile error"); diff --git a/vobject-engine/VCard.c b/vobject-engine/VCard.c index 15f55df..d0abf97 100755 --- a/vobject-engine/VCard.c +++ b/vobject-engine/VCard.c @@ -240,7 +240,7 @@ __VCardGetValue(char* szString, const ValueObj list[], int size) for (i = 0; i < size-1; i++) { VDATA_TRACE(" i : %d", i); - VDATA_TRACE(" for loop %d < %d, list[%d] : %p, list[%d].szName : %p", i, size, i, list[i], i, list[i].szName); + VDATA_TRACE(" for loop %d < %d, list[%d] : %d, list[%d].szName : %p", i, size, i, list[i].flag, i, list[i].szName); VDATA_TRACE(" i : %d", i); if (list[i].szName != NULL) { VDATA_TRACE(" list[%d].szName != NULL", i); @@ -512,8 +512,8 @@ __VCardFreeVTreeMemory(VTree * pTree) while (pCurParam != NULL) { pNextParam = pCurParam->pNext; VDATA_TRACE("pNEXT ==> %p", pCurParam->pNext); - VDATA_TRACE("pPARAM ==> %p", pCurParam->parameter); - VDATA_TRACE("pVALUE ==> %p", pCurParam->paramValue); + VDATA_TRACE("pPARAM ==> %d", pCurParam->parameter); + VDATA_TRACE("pVALUE ==> %d", pCurParam->paramValue); VDATA_TRACE("pCurParam : %p", pCurParam); VDATA_TRACE("pCurParam->parameter : %d", pCurParam->parameter); VDATA_TRACE("pCurParam->paramValue : %d", pCurParam->paramValue); diff --git a/vobject-engine/VMessage.c b/vobject-engine/VMessage.c index 40235d5..d3ac003 100755 --- a/vobject-engine/VMessage.c +++ b/vobject-engine/VMessage.c @@ -214,7 +214,7 @@ __VMsgGetValue(char* szString, const ValueObj list[], int size) for (i = 0; i < size-1; i++) { VDATA_TRACE(" i : %d", i); - VDATA_TRACE(" for loop %d < %d, list[%d] : %p, list[%d].szName : %p", i, size, i, list[i], i, list[i].szName); + VDATA_TRACE(" for loop %d < %d, list[%d] : %d, list[%d].szName : %p", i, size, i, list[i].flag, i, list[i].szName); VDATA_TRACE(" i : %d", i); if (list[i].szName != NULL) { VDATA_TRACE(" list[%d].szName != NULL", i); @@ -464,8 +464,8 @@ __VMsgFreeVTreeMemory(VTree * pTree) while (pCurParam != NULL) { pNextParam = pCurParam->pNext; VDATA_TRACE("pNEXT ==> %p", pCurParam->pNext); - VDATA_TRACE("pPARAM ==> %p", pCurParam->parameter); - VDATA_TRACE("pVALUE ==> %p", pCurParam->paramValue); + VDATA_TRACE("pPARAM ==> %d", pCurParam->parameter); + VDATA_TRACE("pVALUE ==> %d", pCurParam->paramValue); VDATA_TRACE("pCurParam : %p", pCurParam); VDATA_TRACE("pCurParam->parameter : %d", pCurParam->parameter); VDATA_TRACE("pCurParam->paramValue : %d", pCurParam->paramValue); @@ -1374,7 +1374,7 @@ __VMsgTypeEncode(VObject *pTypeObj, char *pType) memset(pRes, '\0', ((len * 8 / 6) + 48)); _VB64Encode(pRes, pEncode, biLen); - VDATA_TRACE("Origin Size: %d, Allocated Size %d, Coverted Size: %d\n", biLen, (len * 8 / 6) + 48, strlen(pRes)); + VDATA_TRACE("Origin Size: %d, Allocated Size %d, Coverted Size: %lu\n", biLen, (len * 8 / 6) + 48, strlen(pRes)); VFREE(pEncode); } else { if ((pRes = (char *)calloc(1, len+30)) == NULL) {