diff options
| author | hhk86.heo <hhk86.heo@samsung.com> | 2016-06-16 19:32:49 +0900 |
|---|---|---|
| committer | hhk86.heo <hhk86.heo@samsung.com> | 2016-06-17 11:06:31 +0900 |
| commit | d58a3bf5a8121b1294457db7b4a7616207665519 (patch) | |
| tree | d3869ed9dd62c70202b1302b114a6eac258ebcdb /include | |
| parent | 700dd2ec843a593833031fcd9403492feee76271 (diff) | |
| download | msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.tar.gz msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.tar.bz2 msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.zip | |
apply tizen c coding rulesubmit/tizen/20160617.020945accepted/tizen/wearable/20160617.084129accepted/tizen/mobile/20160617.084106accepted/tizen/ivi/20160617.084109accepted/tizen/common/20160617.121645
Change-Id: If09083adc58f2bda06aa6e9ed745f1c9594f1cd3
Signed-off-by: hyungkang heo <hhk86.heo@samsung.com>
Diffstat (limited to 'include')
50 files changed, 678 insertions, 779 deletions
diff --git a/include/common/MsgCmdTypes.h b/include/common/MsgCmdTypes.h index 4b8f469..fed00ec 100755 --- a/include/common/MsgCmdTypes.h +++ b/include/common/MsgCmdTypes.h @@ -18,19 +18,19 @@ #define MSG_CMD_TYPES_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define MAX_COOKIE_LEN 20 /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ typedef unsigned int MSG_CMD_TYPE_T; @@ -38,18 +38,16 @@ typedef unsigned int MSG_EVENT_TYPE_T; /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ -typedef struct _MSG_CMD_S -{ +typedef struct _MSG_CMD_S { MSG_CMD_TYPE_T cmdType; char cmdCookie[MAX_COOKIE_LEN]; char cmdData[2]; } MSG_CMD_S; -typedef struct _MSG_EVENT_S -{ +typedef struct _MSG_EVENT_S { MSG_EVENT_TYPE_T eventType; msg_error_t result; char data[2]; @@ -57,11 +55,10 @@ typedef struct _MSG_EVENT_S /*================================================================================================== - ENUMS + ENUMS ==================================================================================================*/ -enum _MSG_CMD_TYPE_E -{ +enum _MSG_CMD_TYPE_E { MSG_CMD_OPEN_HANDLE = 0, MSG_CMD_CLOSE_HANDLE, MSG_CMD_GET_STORAGELIST, @@ -173,8 +170,7 @@ enum _MSG_CMD_TYPE_E MSG_CMD_NUM }; -enum _MSG_EVENT_TYPE_E -{ +enum _MSG_EVENT_TYPE_E { MSG_EVENT_OPEN_HANDLE = 0, MSG_EVENT_CLOSE_HANDLE, MSG_EVENT_GET_STORAGELIST, diff --git a/include/common/MsgCppTypes.h b/include/common/MsgCppTypes.h index 01546d9..da37b5f 100755 --- a/include/common/MsgCppTypes.h +++ b/include/common/MsgCppTypes.h @@ -18,15 +18,16 @@ #define __MSG_CPP_TYPES_H__ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <stdio.h> #include <memory> template <typename T> -void unique_ptr_deleter(T **ptr) { - if (ptr && *ptr ) - delete[] *ptr; +void unique_ptr_deleter(T **ptr) +{ + if (ptr && *ptr) + delete[] *ptr; } template <class T> @@ -44,9 +45,8 @@ public: ~AutoPtr() { - if (ptr) - { - if ( *ptr ) delete[] *ptr; + if (ptr) { + if (*ptr) delete[] *ptr; } } }; diff --git a/include/common/MsgFilterTypes.h b/include/common/MsgFilterTypes.h index eb05322..41ce914 100755 --- a/include/common/MsgFilterTypes.h +++ b/include/common/MsgFilterTypes.h @@ -18,9 +18,9 @@ #define MSG_FILTER_TYPES_H /** - * @file MsgFilterTypes.h - * @brief Defines filter types of messaging framework - * @version 1.0 + * @file MsgFilterTypes.h + * @brief Defines filter types of messaging framework + * @version 1.0 */ /** @@ -31,7 +31,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" @@ -43,15 +43,14 @@ */ /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** * @brief Represents filter informatioin. \n * It represents the basic filter unit. */ -typedef struct -{ +typedef struct { msg_filter_id_t filterId; /**< Indicates the filter ID. */ msg_filter_type_t filterType; /**< Indicates the filter type. */ char filterValue[MAX_FILTER_VALUE_LEN+1]; /**< The value of a filter. */ diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h index ebc78a0..562fc8f 100755 --- a/include/common/MsgInternalTypes.h +++ b/include/common/MsgInternalTypes.h @@ -18,19 +18,19 @@ #define MSG_INTERNAL_TYPES_H /** - * @file MsgInternalTypes.h - * @brief Defines types of messaging framework - * @version 1.0 + * @file MsgInternalTypes.h + * @brief Defines types of messaging framework + * @version 1.0 */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgMmsTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define MSG_DATA_ROOT_PATH TZ_SYS_DATA_PATH"/msg-service/" #define MSG_DATA_PATH MSG_DATA_ROOT_PATH"msgdata/" @@ -53,7 +53,7 @@ #define MAX_SIM_MSISDN_LEN 26 #define MAX_COMMON_INFO_SIZE 20 #define MAX_VCONFKEY_NAME_LEN 128 -#define MAX_SIM_IMSI_LEN 16 +#define MAX_SIM_IMSI_LEN 16 #define MAX_TAPI_SIM_API_TIMEOUT 70 #define MSG_EVENT_MSG_ID_LEN (32) @@ -192,7 +192,7 @@ #define MSG_TELEPHONY_MMS_FEATURE "http://tizen.org/feature/network.telephony.mms" /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ /** @@ -219,14 +219,13 @@ typedef unsigned char MSG_CLASS_TYPE_T; /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** * @brief Represents a message type. */ -typedef struct -{ +typedef struct { MSG_MAIN_TYPE_T mainType; /**< Message main type. See enum _MSG_MAIN_TYPE_E */ MSG_SUB_TYPE_T subType; /**< Message sub type. See enum _MSG_SUB_TYPE_E */ MSG_CLASS_TYPE_T classType; /**< Message class type. See enum _MSG_CLASS_TYPE_E */ @@ -236,8 +235,7 @@ typedef struct /** * @brief Represents a message in the framework. */ -typedef struct -{ +typedef struct { msg_message_id_t msgId; /**< Indicates the message ID of this message. */ msg_thread_id_t threadId; /**< Indicates the thread ID. */ msg_folder_id_t folderId; /**< Indicates the folder ID. */ @@ -270,8 +268,7 @@ typedef struct } MSG_MESSAGE_INFO_S; -typedef struct -{ +typedef struct { msg_message_id_t msgId; /**< Indicates the message ID of this message. */ msg_thread_id_t threadId; /**< Indicates the thread ID. */ msg_folder_id_t folderId; /**< Indicates the folder ID. see enum _MSG_FOLDER_TYPE_E */ @@ -279,7 +276,7 @@ typedef struct MSG_SUB_TYPE_T subType; /**< Message sub type. See enum _MSG_SUB_TYPE_E */ MSG_CLASS_TYPE_T classType; /**< Message class type. See enum _MSG_CLASS_TYPE_E */ msg_storage_id_t storageId; /**< Indicates where the message is saved. see enum _MSG_FOLDER_TYPE_E*/ - msg_struct_list_s *addr_list; + msg_struct_list_s *addr_list; GList *addressList; char replyAddress[MAX_PHONE_NUMBER_LEN+1]; /**< Indicates the reply address. */ char subject[MAX_SUBJECT_LEN+1]; /**< Indicates the message subject. */ @@ -307,8 +304,7 @@ typedef struct /** * @brief Represents message information for thread view. */ -typedef struct -{ +typedef struct { msg_thread_id_t threadId; /**< Indicates the thread ID of this peer. */ char threadName[MAX_THREAD_NAME_LEN+1]; /**< Indicates the name of this peer. > */ MSG_MAIN_TYPE_T mainType; /**< Indicates the latest msg main type. */ @@ -329,8 +325,7 @@ typedef struct /** * @brief Represents message information for conversation view. */ -typedef struct -{ +typedef struct { msg_message_id_t msgId; /**< Indicates the message ID of this message. */ msg_thread_id_t threadId; /**< Indicates the thread ID of this peer. */ MSG_MAIN_TYPE_T mainType; /**< Message main type. See enum _MSG_MAIN_TYPE_E */ @@ -358,8 +353,7 @@ typedef struct int simIndex; } MSG_CONVERSATION_VIEW_S; -typedef struct -{ +typedef struct { MimeType type; /**< Indicates the multipart mime type. see enum MimeType */ char szContentType[MSG_MSG_ID_LEN + 1]; /**< Indicates the content type */ char szFileName[MSG_FILENAME_LEN_MAX + 1]; /**< Indicates the file name */ @@ -367,7 +361,7 @@ typedef struct char szContentID[MSG_MSG_ID_LEN + 1]; /**< Indicates the content id */ char szContentLocation[MSG_MSG_ID_LEN + 1]; /**< Indicates the content Location */ - int tcs_bc_level; /** detect malware type **/ + int tcs_bc_level; /** detect malware type **/ char szThumbFilePath[MSG_FILEPATH_LEN_MAX + 1]; /**< Indicates the thumbnail file path */ } MSG_MMS_MULTIPART_S; @@ -377,8 +371,7 @@ typedef struct * Applications compose a request and send it to the framework via Message handle. \n * This request ID is used to manage the request by the framework. */ -typedef struct -{ +typedef struct { msg_request_id_t reqId; /**< Indicates the request ID, which is unique. When applications submit a request to the framework, this value will be set by the framework. */ MSG_MESSAGE_INFO_S msgInfo; /**< Indicates the message structure to be sent by applications. */ @@ -390,8 +383,7 @@ typedef struct * @brief Represents proxy information. \n * This stucture contains the information about the status cnf of a sent message. */ -typedef struct -{ +typedef struct { int listenerFd; /**< Rx fd for status cnf */ unsigned long handleAddr; /**< Handle address for status cnf */ msg_message_id_t sentMsgId; /**< The ID of a sent message for updating message status */ @@ -402,18 +394,16 @@ typedef struct * @brief Aux data structure for MSG_CMD_REG_INCOMING_MSG_CB. \n * This stucture contains the information about the receiver for msgType and port. */ -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; - unsigned short port; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; + unsigned short port; } MSG_CMD_REG_INCOMING_MSG_CB_S; -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; - bool bsave; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; + bool bsave; } MSG_CMD_REG_CB_INCOMING_MSG_CB_S; @@ -421,10 +411,9 @@ typedef struct * @brief Aux data structure for MSG_CMD_REG_INCOMING_MMS_CONF_MSG_CB. \n * This stucture contains the information about the receiver for msgType and port. */ -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; char appId[MAX_MMS_JAVA_APPID_LEN+1]; } MSG_CMD_REG_INCOMING_MMS_CONF_MSG_CB_S; @@ -433,10 +422,9 @@ typedef struct * @brief Aux data structure for MSG_CMD_REG_INCOMING_SYNCML_MSG_CB. \n * This stucture contains the information about the receiver for msgType and port. */ -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; } MSG_CMD_REG_INCOMING_SYNCML_MSG_CB_S; @@ -444,10 +432,9 @@ typedef struct * @brief Aux data structure for MSG_CMD_REG_INCOMING_LBS_MSG_CB_S. \n * This stucture contains the information about the receiver for msgType and port. */ -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; } MSG_CMD_REG_INCOMING_LBS_MSG_CB_S; @@ -455,10 +442,9 @@ typedef struct * @brief Aux data structure for MSG_CMD_REG_INCOMING_JAVAMMS_TRID_S. \n * This stucture contains the information about the sent Java MMS messge transactionId. */ -typedef struct -{ - bool posted; - char id[MMS_TR_ID_LEN+1]; +typedef struct { + bool posted; + char id[MMS_TR_ID_LEN+1]; char pduFileName[MAX_COMMON_INFO_SIZE+1]; } MSG_CMD_REG_INCOMING_JAVAMMS_TRID_S; @@ -467,24 +453,21 @@ typedef struct * @brief Aux data structure for MSG_CMD_REG_SYNCML_MSG_OPERATION_CB. \n * This stucture contains the information about the receiver for msgType and port. */ -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; } MSG_CMD_REG_SYNCML_MSG_OPERATION_CB_S; -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; char appId[MAX_WAPPUSH_ID_LEN+1]; char content_type[MAX_WAPPUSH_CONTENT_TYPE_LEN+1]; } MSG_CMD_REG_INCOMING_PUSH_MSG_CB_S; -typedef struct -{ - int listenerFd; - MSG_MAIN_TYPE_T msgType; +typedef struct { + int listenerFd; + MSG_MAIN_TYPE_T msgType; bool bsave; } MSG_CMD_REG_INCOMING_CB_MSG_CB_S; @@ -492,8 +475,7 @@ typedef struct /** * @brief Represents a CB message in the framework. */ -typedef struct -{ +typedef struct { MSG_SUB_TYPE_T type; time_t receivedTime; @@ -509,8 +491,7 @@ typedef struct } MSG_CB_MSG_S; #ifdef FEATURE_SMS_CDMA -typedef struct _MSG_UNIQUE_INDEX_S -{ +typedef struct _MSG_UNIQUE_INDEX_S { unsigned short tele_msgId; char address[MAX_ADDRESS_VAL_LEN+1]; char sub_address[MAX_ADDRESS_VAL_LEN+1]; @@ -518,8 +499,7 @@ typedef struct _MSG_UNIQUE_INDEX_S int telesvc_id; } MSG_UNIQUE_INDEX_S; -typedef struct -{ +typedef struct { time_t receivedTime; unsigned short serialNum; unsigned short messageId; /**< Message Identifier */ @@ -528,7 +508,7 @@ typedef struct /*================================================================================================== - ENUMS + ENUMS ==================================================================================================*/ /** @@ -536,8 +516,7 @@ typedef struct * Three main types of a message are predefined : SMS, MMS, and Email. More main types of a message can be defined here. \n * This enum is used as the value of MSG_MAIN_TYPE_T. */ -enum _MSG_MAIN_TYPE_E -{ +enum _MSG_MAIN_TYPE_E { MSG_UNKNOWN_TYPE = 0, /**< Unknown main type */ MSG_SMS_TYPE, /**< SMS */ MSG_MMS_TYPE, /**< MMS */ @@ -549,13 +528,12 @@ enum _MSG_MAIN_TYPE_E * Three sub types of a message are predefined : NORMAL, WAPPUSH, and CB. More sub types of a message can be defined here. \n * This enum is used as the value of MSG_SUB_TYPE_T. */ -enum _MSG_SUB_TYPE_E -{ +enum _MSG_SUB_TYPE_E { /* SMS Specific Message Type */ MSG_NORMAL_SMS = 0, /**< Text SMS message */ MSG_CB_SMS, /**< Cell Broadcasting message */ MSG_JAVACB_SMS, /**< JAVA Cell Broadcasting message */ - MSG_TYPE0_SMS, /**< Short Message Type 0 */ + MSG_TYPE0_SMS, /**< Short Message Type 0 */ MSG_REPLACE_TYPE1_SMS, /**< Replace Short Message Type 1 */ MSG_REPLACE_TYPE2_SMS, /**< Replace Short Message Type 2 */ MSG_REPLACE_TYPE3_SMS, /**< Replace Short Message Type 3 */ @@ -578,7 +556,7 @@ enum _MSG_SUB_TYPE_E /* MMS Specific Message Type */ MSG_SENDREQ_MMS = 24, /**< MMS Send Request message */ - MSG_SENDCONF_MMS, /**< MMS Send Confirm message */ + MSG_SENDCONF_MMS, /**< MMS Send Confirm message */ MSG_NOTIFICATIONIND_MMS, /**< MMS Notification Indication message */ MSG_GET_MMS, /**< MMS GET MMS message */ MSG_NOTIFYRESPIND_MMS, /**< MMS Notify Response Indication message */ @@ -591,9 +569,9 @@ enum _MSG_SUB_TYPE_E MSG_READORGIND_MMS, /**< MMS Read Origin Indication message */ MSG_FORWARD_MMS, /**< MMS Forward message */ MSG_FORWARDREQ_MMS, /**< MMS Forward Request message */ - MSG_FORWARDCONF_MMS, /**< MMS Forward Confirm message */ + MSG_FORWARDCONF_MMS, /**< MMS Forward Confirm message */ MSG_READREPLY_MMS, /**< MMS Read Reply message */ - MSG_SENDREQ_JAVA_MMS, /**< MMS Send Request message for JAVA MMS */ + MSG_SENDREQ_JAVA_MMS, /**< MMS Send Request message for JAVA MMS */ MSG_ETWS_SMS, MSG_MWI_VOICE2_SMS, /**< MWI Message Voice for line 2(CPHS)*/ @@ -612,8 +590,7 @@ enum _MSG_SUB_TYPE_E * @brief Represents the values of File Type of MMS. \n * This enum is used as the value of . */ -enum _MSG_MMS_ITEM_TYPE_E -{ +enum _MSG_MMS_ITEM_TYPE_E { MSG_MMS_ITEM_TYPE_IMG, /**< Indicates the image media */ MSG_MMS_ITEM_TYPE_AUDIO, /**< Indicates the audio media */ MSG_MMS_ITEM_TYPE_VIDEO, /**< Indicates the video media */ diff --git a/include/common/MsgMmsTypes.h b/include/common/MsgMmsTypes.h index 7e48cc3..2c1825e 100755 --- a/include/common/MsgMmsTypes.h +++ b/include/common/MsgMmsTypes.h @@ -18,9 +18,9 @@ #define MSG_MMS_TYPES_H /** - * @file MsgMmsTypes.h - * @brief Defines MMS types of messaging framework - * @version 1.0 + * @file MsgMmsTypes.h + * @brief Defines MMS types of messaging framework + * @version 1.0 */ /** @@ -31,7 +31,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" @@ -48,13 +48,12 @@ typedef GList MMSList; /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ - /** * @brief Represents text information. */ -typedef struct { +typedef struct { char szTransInId[MAX_SMIL_TRANSIN_ID + 1]; /**< Indicates the In SMIL transition id */ char szTransOutId[MAX_SMIL_TRANSOUT_ID + 1]; /**< Indicates the Out SMIL transition id */ int nRepeat; /**< Indicates the text needs to be displayed repeatedly */ @@ -69,7 +68,7 @@ typedef struct { MmsTextDirection nDirection; /**< Indicates the text direction type. see enum MmsTextDirection */ int nSize; /**< Indicates the font size */ int nColor; /**< Indicates the font color */ -}MmsSmilText; +} MmsSmilText; /** * @brief Represents video information. @@ -82,13 +81,12 @@ typedef struct { int nEnd; /**< Indicates the end time */ int nDurTime; /**< Indicates the duration */ int nBgColor; /**< Indicates the background color of the text */ -}MmsSmilAVI; +} MmsSmilAVI; /** * @brief Represents media information. */ -typedef struct -{ +typedef struct { MmsSmilMediaType mediatype; /**< Indicates the SMIL media type. see enum MmsSmilMediaType */ char szSrc[MSG_FILEPATH_LEN_MAX + 1];/**< Indicates the media source name */ @@ -111,8 +109,7 @@ typedef struct /** * @brief Represents attachment information. */ -typedef struct -{ +typedef struct { MimeType mediatype; /**< Indicates the file mime type. see enum MimeType */ char szFileName[MSG_FILENAME_LEN_MAX + 1]; /**< Indicates the file name */ char szFilePath[MSG_FILEPATH_LEN_MAX + 1]; /**< Indicates the file path */ @@ -125,32 +122,29 @@ typedef struct /** * @brief Represents SMIL page information. */ -typedef struct -{ +typedef struct { int mediaCnt; /**< The count of the media */ - GList *medialist; /**< The pointer to media list */ + GList *medialist; /**< The pointer to media list */ int nDur; /**< Indicates the duration of the page */ int nBegin; /**< Indicates the begin time of the page */ int nEnd; /**< Indicates the end time of the page */ int nMin; /**< Indicates the min attribute of the page */ int nMax; /**< Indicates the max attribute of the page */ int nRepeat; /**< Indicates the page needs to be displayed repeatedly */ -}MMS_PAGE_S; +} MMS_PAGE_S; /** * @brief Represents length information. */ -typedef struct -{ - bool bUnitPercent; /**< Indicates the length is in percentage(%) or not */ +typedef struct { + bool bUnitPercent; /**< Indicates the length is in percentage(%) or not */ int value; /**< Indicates the value for length */ } MMS_LENGTH; /** * @brief Represents SMIL region information. */ -typedef struct -{ +typedef struct { char szID[MAX_SMIL_REGION_ID + 1]; /**< Indicates the ID of region information */ MMS_LENGTH nLeft; /**< Indicates the left co-ordinate of the region */ MMS_LENGTH nTop; /**< Indicates the top co-ordinate of the region */ @@ -164,59 +158,54 @@ typedef struct /** * @brief Represents SMIL root layout information. */ -typedef struct -{ +typedef struct { MMS_LENGTH width; /**< Indicates the width of the root layout */ MMS_LENGTH height; /**< Indicates the height of the root layout, '%' rate should be supported */ bool bBgColor; /**< Indicates the background color set in the root layout */ int bgColor; /**< Indicates the background color of the root layout */ -}MMS_SMIL_ROOTLAYOUT; +} MMS_SMIL_ROOTLAYOUT; /** * @brief Represents SMIL transition information. */ -typedef struct -{ +typedef struct { char szID[MAX_SMIL_TRANSITION_ID + 1]; /**< Indicates the ID of transition information */ MmsSmilTransType nType; /**< Indicates the transition type. see enum MmsSmilTransType */ MmsSmilTransSubType nSubType; /**< Indicates the transition sub type. see enum MmsSmilTransSubType */ int nDur; /**< Indicates the transition duration */ -}MMS_SMIL_TRANSITION; +} MMS_SMIL_TRANSITION; /** * @brief Represents SMIL meta information. */ -typedef struct -{ +typedef struct { char szID[MAX_SMIL_META_ID + 1]; /**< Indicates the ID of meta information */ char szName[MAX_SMIL_META_NAME + 1]; /**< Indicates the Name */ char szContent[MAX_SMIL_META_CONTENT + 1]; /**< Indicates the content */ -}MMS_SMIL_META; +} MMS_SMIL_META; /** * @brief Represents application id information for JAVA MMS msg. */ -typedef struct -{ - bool valid; /**< Indicates whether application id information is used or not. */ - char appId[MAX_MMS_JAVA_APPID_LEN + 1]; /**< application id, it should not exceed 32 chars */ - char replyToAppId[MAX_MMS_JAVA_APPID_LEN + 1]; /**< reply to application id, application id, it should not exceeded 32 chars */ -}MMS_APPID_INFO_S; +typedef struct { + bool valid; /**< Indicates whether application id information is used or not. */ + char appId[MAX_MMS_JAVA_APPID_LEN + 1]; /**< application id, it should not exceed 32 chars */ + char replyToAppId[MAX_MMS_JAVA_APPID_LEN + 1]; /**< reply to application id, application id, it should not exceeded 32 chars */ +} MMS_APPID_INFO_S; #define MAX_FULL_PATH_SIZE_S 160 /* max length for internal file path */ -typedef struct -{ +typedef struct { char szMsgID[MMS_MSG_ID_LEN + 1]; char retrievedFilePath[MAX_FULL_PATH_SIZE_S + 1]; char szTrID[MMS_TR_ID_LEN + 1]; MMS_APPID_INFO_S msgAppId; -}MMS_RECV_DATA_S; +} MMS_RECV_DATA_S; typedef struct _MMS_ADDRESS_DATA_S { int address_type; @@ -226,8 +215,7 @@ typedef struct _MMS_ADDRESS_DATA_S { /** * @brief Represents MMS header data. */ -typedef struct _MMS_HEADER_DATA_S -{ +typedef struct _MMS_HEADER_DATA_S { MMSList *bcc; /* Bcc */ MMSList *cc; /* Cc */ char contentLocation[MMS_LOCATION_LEN + 1]; @@ -241,10 +229,10 @@ typedef struct _MMS_HEADER_DATA_S char messageID[MSG_MSG_ID_LEN + 1]; int messageType; /* MmsMsgType : ex) sendreq */ int mmsVersion; /* 1.0 1.3 */ - int messageSize; /* X-Mms-Message-Size */ + int messageSize; /* X-Mms-Message-Size */ int mmsPriority; /* _MSG_PRIORITY_TYPE_E : Low | Normal | High */ bool bReadReport; /* X-Mms-Read-Report */ - bool bHideAddress; /* X-Mms-Sender-Visibility */ + bool bHideAddress; /* X-Mms-Sender-Visibility */ msg_delivery_report_status_t mmsStatus; /* X-Mms-Status */ char szSubject[MAX_SUBJECT_LEN + 1]; /* Subject */ MMSList *to; /* to */ @@ -298,8 +286,7 @@ typedef struct _MMS_HEADER_DATA_S /** * @brief Represents MMS multipart data. */ -typedef struct -{ +typedef struct { MimeType type; /**< Indicates the multipart mime type. see enum MimeType */ char szContentType[MSG_MSG_ID_LEN + 1]; /**< Indicates the content type */ char szFileName[MSG_FILENAME_LEN_MAX + 1]; /**< Indicates the file name */ @@ -311,29 +298,28 @@ typedef struct char *pMultipartData; size_t nMultipartDataLen; int tcs_bc_level; /** detect malware type **/ - int malware_allow; + int malware_allow; char szThumbFilePath[MSG_FILEPATH_LEN_MAX + 1]; /**< Indicates the thubnail file path */ } MMS_MULTIPART_DATA_S; /** * @brief Represents MMS message data. */ -typedef struct _MMS_MESSAGE_DATA_S -{ - int backup_type; /**< normal = 0|| backup = 1; */ +typedef struct _MMS_MESSAGE_DATA_S { + int backup_type; /**< normal = 0|| backup = 1; */ char szSmilFilePath[MSG_FILEPATH_LEN_MAX + 1]; /**< Indicates the SMIL file path */ int pageCnt; /**< The count of the SMIL pages */ GList *pagelist; /**< The pointer to SMIL pages list */ int regionCnt; /**< The count of the SMIL regions */ - GList *regionlist; /**< The pointer to SMIL regions list */ + GList *regionlist; /**< The pointer to SMIL regions list */ int attachCnt; /**< The count of the attachments */ - GList *attachlist; /**< The pointer to attachment list */ + GList *attachlist; /**< The pointer to attachment list */ int transitionCnt; /**< The count of the SMIL transitions information */ - GList *transitionlist; /**< The pointer to SMIL transitions list */ + GList *transitionlist; /**< The pointer to SMIL transitions list */ int metaCnt; /**< The count of the SMIL meta information */ - GList *metalist; /**< The pointer to SMIL meta list */ + GList *metalist; /**< The pointer to SMIL meta list */ MMS_SMIL_ROOTLAYOUT rootlayout; /**< Indicates the root layout information */ - MMS_APPID_INFO_S msgAppId; + MMS_APPID_INFO_S msgAppId; MMS_HEADER_DATA_S header; /**< use for scloud */ MMS_MULTIPART_DATA_S smil;/**< use for scloud */ } MMS_MESSAGE_DATA_S; @@ -341,8 +327,7 @@ typedef struct _MMS_MESSAGE_DATA_S /** * @brief Represents MMS message data. */ -typedef struct -{ +typedef struct { int backup_type; /* none = 0 || scloud backup = 1 || kies backup = 2; */ MMS_HEADER_DATA_S *header; /**< The header struct of MMS*/ MMS_MULTIPART_DATA_S *smil; diff --git a/include/common/MsgPluginInterface.h b/include/common/MsgPluginInterface.h index cd8daa5..62ab9fb 100755 --- a/include/common/MsgPluginInterface.h +++ b/include/common/MsgPluginInterface.h @@ -15,9 +15,9 @@ */ /** - * @file MsgPluginInterface.h - * @brief Defines plug-ins API of messaging framework - * @version 1.0 + * @file MsgPluginInterface.h + * @brief Defines plug-ins API of messaging framework + * @version 1.0 */ #ifndef MSG_PLUGIN_INTERFACE_H @@ -31,7 +31,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTransportTypes.h" #include "MsgStorageTypes.h" @@ -51,7 +51,7 @@ extern "C" */ /*================================================================================================== - TYPE DEFINES + TYPE DEFINES ==================================================================================================*/ typedef struct _MSG_PLUGIN_HANDLER_S MSG_PLUGIN_HANDLER_S; @@ -59,7 +59,7 @@ typedef struct _MSG_PLUGIN_LISTENER_S MSG_PLUGIN_LISTENER_S; /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ /** @@ -1067,10 +1067,9 @@ typedef bool (*MsgPlgCheckUniqueness)(MSG_UNIQUE_INDEX_S *p_msg, msg_message_id_ typedef msg_error_t (*MsgPlgOnInitImsi)(int sim_idx); /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ -struct _MSG_PLUGIN_LISTENER_S -{ +struct _MSG_PLUGIN_LISTENER_S { MsgPlgOnSentStatus pfSentStatusCb; /** The function pointer of sent status callback. */ MsgPlgOnStorageChange pfStorageChangeCb; /** The function pointer of storage change callback. */ MsgPlgOnMsgIncoming pfMsgIncomingCb; /** The function pointer of receive message callback. */ @@ -1079,7 +1078,7 @@ struct _MSG_PLUGIN_LISTENER_S MsgPlgOnLBSMsgIncoming pfLBSMsgIncomingCb; /** The function pointer of receive LBS message callback. */ MsgPlgOnPushMsgIncoming pfPushMsgIncomingCb; /** The function pointer of receive Push message callback. */ MsgPlgOnCBMsgIncoming pfCBMsgIncomingCb; /** The function pointer of receive cb message callback. */ - MsgPlgOnMmsConfIncoming pfMmsConfIncomingCb; /** The function pointer of receive MMS conf */ + MsgPlgOnMmsConfIncoming pfMmsConfIncomingCb; /** The function pointer of receive MMS conf */ MsgPlgOnSimMessageIncoming pfSimMsgIncomingCb; /** The function pointer of sim message callback */ MsgPlgOnResendMessage pfResendMessageCb; #ifdef FEATURE_SMS_CDMA @@ -1089,13 +1088,12 @@ struct _MSG_PLUGIN_LISTENER_S }; -struct _MSG_PLUGIN_HANDLER_S -{ - MsgPlgInitialize pfInitialize; /**< The function pointer of initialize. */ - MsgPlgFinalize pfFinalize; /**< The function pointer of finalize. */ - MsgPlgRegisterListener pfRegisterListener; /**< The function pointer of register listener. */ - MsgPlgSubmitRequest pfSubmitRequest; /**< The function pointer of submit request. */ - MsgPlgSaveSimMessage pfSaveSimMessage; /**< The function pointer of save SIM msg. */ +struct _MSG_PLUGIN_HANDLER_S { + MsgPlgInitialize pfInitialize; /**< The function pointer of initialize. */ + MsgPlgFinalize pfFinalize; /**< The function pointer of finalize. */ + MsgPlgRegisterListener pfRegisterListener; /**< The function pointer of register listener. */ + MsgPlgSubmitRequest pfSubmitRequest; /**< The function pointer of submit request. */ + MsgPlgSaveSimMessage pfSaveSimMessage; /**< The function pointer of save SIM msg. */ MsgPlgDeleteSimMessage pfDeleteSimMessage; /**< The function pointer of delete SIM msg. */ MsgPlgSetReadStatus pfSetReadStatus; /**< The function pointer of set read status. */ MsgPlgSetMemoryStatus pfSetMemoryStatus; /**< The function pointer of set memory status. */ @@ -1104,10 +1102,10 @@ struct _MSG_PLUGIN_HANDLER_S MsgPlgRestoreMsg pfRestoreMsg; MsgPlgAddMessage pfAddMessage; /**< The function pointer of add Message. */ MsgPlgProcessReceivedInd pfProcessReceivedInd; /**< The function pointer of Process Notification Ind. */ - MsgPlgUpdateMessage pfUpdateMessage; /**< The function pointer of Update MMS Message */ - MsgPlgGetMmsMessage pfGetMmsMessage; + MsgPlgUpdateMessage pfUpdateMessage; /**< The function pointer of Update MMS Message */ + MsgPlgGetMmsMessage pfGetMmsMessage; MsgPlgUpdateRejectStatus pfUpdateRejectStatus; - MsgPlgComposeReadReport pfComposeReadReport; + MsgPlgComposeReadReport pfComposeReadReport; MsgPlgGetDefaultNetworkSimId pfGetDefaultNetworkSimId; }; diff --git a/include/common/MsgQueue.h b/include/common/MsgQueue.h index d1a06c2..21ad9a9 100755 --- a/include/common/MsgQueue.h +++ b/include/common/MsgQueue.h @@ -25,7 +25,7 @@ template <typename T> class MsgSimpleQ { public: - MsgSimpleQ(){}; + MsgSimpleQ() {}; void pop_front(); bool front(T* qItem); void push_front(T const & input); @@ -34,7 +34,7 @@ public: bool empty(); void clear(); bool checkExist(T const & qItem, bool(cmp)(T const &, T const &)); - void remove(T const & qItem, bool(cmp)(T const &, T const &) ); + void remove(T const & qItem, bool(cmp)(T const &, T const &)); private: std::list <T> q; }; @@ -42,7 +42,7 @@ private: template <typename T> void MsgSimpleQ<T>::pop_front() { - if(q.empty()) return; + if (q.empty()) return; q.pop_front(); } @@ -50,7 +50,7 @@ void MsgSimpleQ<T>::pop_front() template <typename T> bool MsgSimpleQ<T>::front(T* qItem) { - if( qItem == NULL || q.empty() ) + if (qItem == NULL || q.empty()) return false; /* Fail */ *qItem = q.front(); /* copy */ diff --git a/include/common/MsgSettingTypes.h b/include/common/MsgSettingTypes.h index a3a8488..6ff8fdf 100755 --- a/include/common/MsgSettingTypes.h +++ b/include/common/MsgSettingTypes.h @@ -18,9 +18,9 @@ #define MSG_SETTING_TYPES_H /** - * @file MsgSettingTypes.h - * @brief Defines setting types of messaging framework - * @version 1.0 + * @file MsgSettingTypes.h + * @brief Defines setting types of messaging framework + * @version 1.0 */ /** @@ -31,7 +31,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" #include "MsgStorageTypes.h" @@ -43,7 +43,7 @@ */ /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ /** @@ -193,14 +193,13 @@ typedef int MSG_RINGTONE_TYPE_T; /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** * @brief Represents SMSC address information. */ -typedef struct -{ +typedef struct { MSG_SMS_TON_T ton; /**< Type of number */ MSG_SMS_NPI_T npi; /**< Numbering plan ID */ char address[SMSC_ADDR_MAX+1]; /**< SMSC address */ @@ -210,8 +209,7 @@ typedef struct /** * @brief Represents SMSC data information. */ -typedef struct -{ +typedef struct { MSG_SMS_PID_T pid; /**< Protocol idendifier */ MSG_VAL_PERIOD_T valPeriod; /**< Validity period value */ char name[SMSC_NAME_MAX+1]; /**< SMSC name */ @@ -222,36 +220,33 @@ typedef struct /** * @brief Represents an SMSC list. */ -typedef struct -{ +typedef struct { int index; /**< SMSC index for Updating information */ int selected; /**< Selected SMSC index */ int totalCnt; /**< The count of total SMSC addresses */ MSG_SMSC_DATA_S smscData[SMSC_LIST_MAX]; /**< SMSC data information list*/ - msg_sim_slot_id_t simIndex; -}MSG_SMSC_LIST_S; + msg_sim_slot_id_t simIndex; +} MSG_SMSC_LIST_S; /** * @brief Represents an SMSC list. */ -typedef struct -{ +typedef struct { int index; /**< SMSC index for Updating information */ int selected; /**< Selected SMSC index */ msg_struct_list_s *smsc_list; /**< SMSC data information list*/ - msg_sim_slot_id_t simIndex; -}MSG_SMSC_LIST_HIDDEN_S; + msg_sim_slot_id_t simIndex; +} MSG_SMSC_LIST_HIDDEN_S; /** * @brief Represents the information of a cell broadcasting channel. */ -typedef struct -{ +typedef struct { bool bActivate; /**< Indicates whether the CB channel is activate or passive. */ - unsigned int from; /**< Indicates the start ID of a CB channel range. */ - unsigned int to; /**< Indicates the end ID of a CB channel range. */ + unsigned int from; /**< Indicates the start ID of a CB channel range. */ + unsigned int to; /**< Indicates the end ID of a CB channel range. */ unsigned short ctg; /**< Indicates the category of a CB. (for 3gpp2)*/ unsigned short lang; /**< Indicates the language of a CB. (for 3gpp2)*/ char name[CB_CHANNEL_NAME_MAX+1]; /**< Indicates the name of a CB channel. */ @@ -261,8 +256,7 @@ typedef struct /** * @brief Represents cell broadcasting channel information. */ -typedef struct -{ +typedef struct { int channelCnt; /**< The count of CB channels */ MSG_CB_CHANNEL_INFO_S channelInfo[CB_CHANNEL_MAX]; /**< The structure of CB channel information */ } MSG_CB_CHANNEL_S; @@ -271,41 +265,38 @@ typedef struct /** * @brief Represents an general option. */ -typedef struct -{ +typedef struct { bool bKeepCopy; /**< Indicates whether the SMS message copy is kept or not. */ MSG_ALERT_TONE_T alertTone; /**< Indicates the period of playing alert tone. */ bool bAutoErase; /**< Indicates whether the auto-erase option is enabled or not. */ bool bBlockUnknownMsg; /**< Indicates whether unknown sender message is blocked or not. */ int smsLimitCnt; /**< Indicates the count limitation of sms messages in one conversation */ int mmsLimitCnt; /**< Indicates the count limitation of sms messages in one conversation */ - bool bNotification; /**< Indicates whether notification for incoming message is shown or not. */ + bool bNotification; /**< Indicates whether notification for incoming message is shown or not. */ bool bVibration; /**< Indicates whether vibration for incoming message is run or not. */ bool bPreview; /**< Indicates whether preview for incoming message is shown or not. */ - char ringtonePath[MSG_FILEPATH_LEN_MAX+1]; /**< Indicates the message ringtone path */ - int ringtoneType; /**< Indicates the message ringtone type. */ -}MSG_GENERAL_OPT_S; + char ringtonePath[MSG_FILEPATH_LEN_MAX+1]; /**< Indicates the message ringtone path */ + int ringtoneType; /**< Indicates the message ringtone type. */ +} MSG_GENERAL_OPT_S; /** * @brief Represents an SMS send option. */ -typedef struct -{ +typedef struct { msg_encode_type_t dcs; /**< Indicates the string encoding type. */ MSG_SMS_NETWORK_MODE_T netMode; /**< Indicates the network mode (CS/PS) to send SMS. */ bool bReplyPath; /**< Indicates whether the SMS reply path is set or not. */ bool bDeliveryReport; /**< Indicates whether the SMS delivery report will be sent or not. */ MSG_SMS_SAVE_STORAGE_T saveStorage; /**< Indicates the default storage to save SMS. */ -}MSG_SMS_SENDOPT_S; +} MSG_SMS_SENDOPT_S; /** * @brief Represents an MMS send option. */ -typedef struct -{ - MSG_MMS_MSG_CLASS_TYPE_T msgClass; +typedef struct { + MSG_MMS_MSG_CLASS_TYPE_T msgClass; msg_priority_type_t priority; /**< Indicates the priority of the message. */ MSG_MMS_EXPIRY_TIME_T expiryTime; /**< Indicates the time when the message is to be removed from the MMSC. */ MSG_MMS_DELIVERY_TIME_T deliveryTime; /**< Indicates the message transmission time which is set in the MMSC. */ @@ -317,7 +308,7 @@ typedef struct bool bBodyReplying; /**< Indicates whether the body is included when replying or not. */ bool bHideRecipients; /**< Indicates whether the recipients are hidden or not. */ - MSG_MMS_REPLY_CHARGING_TYPE_T replyCharging; + MSG_MMS_REPLY_CHARGING_TYPE_T replyCharging; unsigned int replyChargingDeadline; unsigned int /*long*/ replyChargingSize; @@ -328,8 +319,7 @@ typedef struct /** * @brief Represents an MMS receive option. */ -typedef struct -{ +typedef struct { MSG_MMS_HOME_RETRIEVE_TYPE_T homeNetwork; /**< Indicates the retrieve type for MMS home network. */ MSG_MMS_ABROAD_RETRIEVE_TYPE_T abroadNetwork; /**< Indicates the retrieve type for MMS abroad network. */ #if 0 @@ -345,8 +335,7 @@ typedef struct /** * @brief Represents an MMS style option. */ -typedef struct -{ +typedef struct { unsigned int fontSize; bool bFontStyleBold; bool bFontStyleItalic; @@ -368,8 +357,7 @@ typedef struct /** * @brief Represents a push message option. */ -typedef struct -{ +typedef struct { bool bReceive; /**< Indicates whether the push message is received or not. */ MSG_PUSH_SERVICE_TYPE_T serviceType; /**< Indicates the service type of a push message. */ } MSG_PUSHMSG_OPT_S; @@ -378,8 +366,7 @@ typedef struct /** * @brief Represents a cell broadcasting message option. */ -typedef struct -{ +typedef struct { bool bReceive; /**< Indicates whether the CB message is received or not. */ int maxSimCnt; /**< Indicates the number of channels which can be stored in SIM. */ MSG_CB_CHANNEL_S channelData; /**< Indicates the cell broadcasting channel information. */ @@ -387,8 +374,7 @@ typedef struct msg_sim_slot_id_t simIndex; } MSG_CBMSG_OPT_S; -typedef struct -{ +typedef struct { bool bReceive; /**< Indicates whether the CB message is received or not. */ int maxSimCnt; /**< Indicates the number of channels which can be stored in SIM. */ msg_struct_list_s *channelData; /**< Indicates the cell broadcasting channel information. */ @@ -400,8 +386,7 @@ typedef struct /** * @brief Represents a voice mail number option. */ -typedef struct -{ +typedef struct { char mailNumber[MAX_PHONE_NUMBER_LEN+1]; char alpahId[MAX_SIM_XDN_ALPHA_ID_LEN+1]; msg_sim_slot_id_t simIndex; @@ -412,8 +397,7 @@ typedef struct /** * @brief Represents a MMS size option. */ -typedef struct -{ +typedef struct { int nMsgSize; } MSG_MSGSIZE_OPT_S; @@ -421,8 +405,7 @@ typedef struct /** * @brief Represents setting information. */ -typedef struct -{ +typedef struct { MSG_OPTION_TYPE_T type; /**< The option type in a setting */ union { @@ -437,7 +420,7 @@ typedef struct MSG_VOICEMAIL_OPT_S voiceMailOpt; /**< voice mail option */ MSG_MSGSIZE_OPT_S msgSizeOpt; /**< MMS size option */ } option; -}MSG_SETTING_S; +} MSG_SETTING_S; /** diff --git a/include/common/MsgStorageTypes.h b/include/common/MsgStorageTypes.h index 6332864..4912806 100755 --- a/include/common/MsgStorageTypes.h +++ b/include/common/MsgStorageTypes.h @@ -19,9 +19,9 @@ /** - * @file MsgStorageTypes.h - * @brief Defines transport types of messaging framework - * @version 1.0 + * @file MsgStorageTypes.h + * @brief Defines transport types of messaging framework + * @version 1.0 */ @@ -33,7 +33,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <time.h> @@ -48,14 +48,13 @@ * @{ */ /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** * @brief Represents the count of read/unread messages. */ -typedef struct -{ +typedef struct { int nReadCnt; /**< The count of read messages */ int nUnreadCnt; /**< The count of unread messages */ int nSms; /**< The count of sms type messages */ @@ -66,9 +65,8 @@ typedef struct /** * @brief Represents a reject message information. */ -typedef struct -{ - msg_message_id_t msgId; /**< Indicates the unique message ID. */ +typedef struct { + msg_message_id_t msgId; /**< Indicates the unique message ID. */ char msgText[MAX_MSG_TEXT_LEN+1]; /**< Indicates the message text. */ time_t displayTime; } MSG_REJECT_MSG_INFO_S; @@ -77,10 +75,9 @@ typedef struct /** * @brief Represents folder information. */ -typedef struct -{ - msg_folder_id_t folderId; /**< Indicates the unique folder ID. */ - char folderName[MAX_FOLDER_NAME_SIZE+1]; /**< Indicates the name of the folder. */ +typedef struct { + msg_folder_id_t folderId; /**< Indicates the unique folder ID. */ + char folderName[MAX_FOLDER_NAME_SIZE+1]; /**< Indicates the name of the folder. */ msg_folder_type_t folderType; /**< Indicates the folder type. */ } MSG_FOLDER_INFO_S; @@ -88,16 +85,15 @@ typedef struct /** * @brief Represents contact information. */ -typedef struct -{ +typedef struct { msg_contact_id_t contactId; /**< Indicates the unique contact ID. */ int addrbookId; /**< Indicates the address book ID. */ - char firstName[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the first name of contact. */ - char lastName[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the last name of contact. */ - char middleName[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the middle name of contact. */ - char prefix[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the prefix of contact. */ - char suffix[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the suffix of contact. */ - char imagePath[MAX_IMAGE_PATH_LEN+1]; /**< Indicates the image path of contact. */ + char firstName[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the first name of contact. */ + char lastName[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the last name of contact. */ + char middleName[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the middle name of contact. */ + char prefix[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the prefix of contact. */ + char suffix[MAX_DISPLAY_NAME_LEN+1]; /**< Indicates the suffix of contact. */ + char imagePath[MAX_IMAGE_PATH_LEN+1]; /**< Indicates the image path of contact. */ char alerttonePath[MSG_FILEPATH_LEN_MAX+1]; /**< Indicates the message alert tone path of contact. */ char vibrationPath[MSG_FILEPATH_LEN_MAX+1]; /**< Indicates the vibration path of contact. */ } MSG_CONTACT_INFO_S; @@ -108,18 +104,16 @@ typedef struct * The sort rule structure includes a sort type and a sort order. \n * Applications can use the sort rule when querying messages. */ -typedef struct -{ +typedef struct { msg_sort_type_t sortType; /**< Indicates the sort type, See enum _MSG_SORT_TYPE_E */ bool bAscending; /**< Indicates the sort order which is ascending or descending */ -}MSG_SORT_RULE_S; +} MSG_SORT_RULE_S; /** * @brief Represents SIM ID List. */ -typedef struct -{ +typedef struct { unsigned int count; /**< The total number of SIM Msg ID*/ msg_sim_id_t simId[MAX_SEGMENT_NUM]; /**< The SIM Msg ID List */ } SMS_SIM_ID_LIST_S; @@ -128,8 +122,7 @@ typedef struct /** * @brief Represents recipien list information. */ -typedef struct -{ +typedef struct { int recipientCnt; MSG_ADDRESS_INFO_S* recipientAddr; } MSG_RECIPIENTS_LIST_S; @@ -138,8 +131,7 @@ typedef struct /** * @brief Represents Message list condition values. */ -typedef struct -{ +typedef struct { msg_folder_id_t folderId; msg_thread_id_t threadId; msg_storage_id_t storageId; @@ -158,8 +150,7 @@ typedef struct } MSG_LIST_CONDITION_S; -typedef struct -{ +typedef struct { int appcode; char appid[MAX_WAPPUSH_ID_LEN]; } PUSH_APPLICATION_INFO_S; diff --git a/include/common/MsgThread.h b/include/common/MsgThread.h index 88d1875..fcaf6a0 100755 --- a/include/common/MsgThread.h +++ b/include/common/MsgThread.h @@ -19,20 +19,21 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <pthread.h> #include "MsgDebug.h" /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgThread { public: MsgThread(): thd(0) {}; - virtual void start() { + virtual void start() + { MSG_DEBUG("MsgThread::Start() called"); if (pthread_create(&thd, NULL, &MsgThread::thdMain, this) < 0) { @@ -43,18 +44,21 @@ public: pthread_detach(thd); } - virtual void stop() { + virtual void stop() + { MSG_DEBUG("MsgThread::stop() called"); } - void wait() { + void wait() + { MSG_DEBUG("MsgThread::Wait() called"); void* pData; pthread_join(thd, &pData); } private: - static void* thdMain(void* pInst) { + static void* thdMain(void* pInst) + { MSG_DEBUG("MsgThread::thdMain() called"); MsgThread* pt = static_cast<MsgThread*>(pInst); pt->run(); @@ -67,5 +71,5 @@ private: }; -#endif //__MSG_THREAD_H__ +#endif /* __MSG_THREAD_H__ */ diff --git a/include/common/MsgTransportTypes.h b/include/common/MsgTransportTypes.h index c8ebbe4..2e7185b 100755 --- a/include/common/MsgTransportTypes.h +++ b/include/common/MsgTransportTypes.h @@ -18,9 +18,9 @@ #define MSG_TRANSPORT_TYPES_H /** - * @file MsgTransportTypes.h - * @brief Defines transport types of messaging framework - * @version 1.0 + * @file MsgTransportTypes.h + * @brief Defines transport types of messaging framework + * @version 1.0 */ /** @@ -31,7 +31,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" #include "MsgStorageTypes.h" @@ -47,22 +47,21 @@ /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** * @brief Represents the status of a sent message. \n * This stucture contains the information about the status of a sent message that application has submitted to the framework. */ -typedef struct -{ +typedef struct { msg_request_id_t reqId; /**< Indicates the corresponding request Id. */ msg_network_status_t status; /**< Indicates the status of the corresponding request. Refer to enum _MSG_NETWORK_STATUS_E*/ } MSG_SENT_STATUS_S; /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ diff --git a/include/common/MsgTypes.h b/include/common/MsgTypes.h index 6f67b08..12da13d 100755 --- a/include/common/MsgTypes.h +++ b/include/common/MsgTypes.h @@ -18,9 +18,9 @@ #define MSG_TYPES_H /** - * @file MsgTypes.h - * @brief Defines common types of messaging framework - * @version 1.0 + * @file MsgTypes.h + * @brief Defines common types of messaging framework + * @version 1.0 */ /** @@ -31,7 +31,7 @@ */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <stdlib.h> #include <stdio.h> @@ -47,7 +47,7 @@ */ /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ /** @@ -75,18 +75,17 @@ typedef struct _msg_struct { int type; void *data; -}msg_struct_s; +} msg_struct_s; /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** * @brief Represents address information. */ -typedef struct -{ +typedef struct { msg_address_type_t addressType; /**< The type of an address in case of an Email or a mobile phone */ msg_recipient_type_t recipientType; /**< The type of recipient address in case of To, Cc, and Bcc */ msg_contact_id_t contactId; /**< The contact ID of address */ @@ -98,8 +97,7 @@ typedef struct /** * @brief Represents port number information. */ -typedef struct -{ +typedef struct { bool valid; /**< Indicates whether port information is used or not. */ unsigned short dstPort; /**< Recipient port number, not greater than 16 bit */ unsigned short srcPort; /**< Sender port number, not greater than 16 bit */ @@ -109,8 +107,7 @@ typedef struct /** * @brief Represents MMS Sending Option Structure in application. */ -typedef struct -{ +typedef struct { bool bReadReq; time_t expiryTime; bool bUseDeliveryCustomTime; @@ -122,8 +119,7 @@ typedef struct /** * @brief Represents SMS Sending Option Structure in application. */ -typedef struct -{ +typedef struct { bool bReplyPath; } SMS_SENDINGOPT_S; @@ -131,8 +127,7 @@ typedef struct /** * @brief Represents MSG Sending Option Structure in application. */ -typedef struct -{ +typedef struct { bool bSetting; bool bDeliverReq; bool bKeepCopy; @@ -141,27 +136,24 @@ typedef struct } MSG_SENDINGOPT_S; -typedef enum -{ +typedef enum { MMS_TIMETYPE_NONE = -1, /**< fixme: backward compatibility */ MMS_TIMETYPE_ERROR = -1, /**< error return in Get method */ MMS_TIMETYPE_RELATIVE = 0, /**< default */ MMS_TIMETYPE_ABSOLUTE = 1 -}MmsTimeType; +} MmsTimeType; -typedef struct -{ +typedef struct { MmsTimeType type; unsigned int time; -}MmsTimeStruct; +} MmsTimeStruct; /** * @brief Represents MMS Sending Option Structure in framework. */ -typedef struct -{ +typedef struct { bool bReadReq; bool bUseDeliveryCustomTime; msg_priority_type_t priority; @@ -173,8 +165,7 @@ typedef struct /** * @brief Represents SMS Sending Option Structure in framework. */ -typedef struct -{ +typedef struct { bool bReplyPath; } SMS_SENDINGOPT_INFO_S; @@ -182,15 +173,14 @@ typedef struct /** * @brief Represents MSG Sending Option Structure in framework. */ -typedef struct -{ +typedef struct { bool bSetting; bool bDeliverReq; bool bKeepCopy; union { - MMS_SENDINGOPT_INFO_S mmsSendOptInfo; - SMS_SENDINGOPT_INFO_S smsSendOptInfo; + MMS_SENDINGOPT_INFO_S mmsSendOptInfo; + SMS_SENDINGOPT_INFO_S smsSendOptInfo; } option; } MSG_SENDINGOPT_INFO_S; @@ -200,8 +190,7 @@ typedef struct * Applications compose a request and send it to the framework via Message handle. \n * This request ID is used to manage the request by the framework. */ -typedef struct -{ +typedef struct { msg_request_id_t reqId; /**< Indicates the request ID, which is unique. When applications submit a request to the framework, this value will be set by the framework. */ msg_struct_t msg; /**< Indicates the message structure to be sent by applications. */ @@ -213,14 +202,12 @@ typedef struct * @brief Represents Address information list. */ -typedef struct -{ +typedef struct { msg_contact_id_t contactId; /**< The contact id of message common informatioin */ MSG_ADDRESS_INFO_S msgAddrInfo; /**< The pointer to message common informatioin */ } MSG_THREAD_LIST_INDEX_S; -typedef struct -{ +typedef struct { msg_contact_id_t contactId; /**< The contact id of message common informatioin */ msg_struct_t msgAddrInfo; /**< The pointer to message common informatioin */ } MSG_THREAD_LIST_INDEX_INFO_S; @@ -229,21 +216,19 @@ typedef struct /** * @brief Represents Peer Count Info. */ -typedef struct -{ +typedef struct { int totalCount; /**< Indicates the total number of messages from the Peer. */ int unReadCount; /**< Indicates the unread messages from the Peer. */ int smsMsgCount; /**< Indicates the SMS messages from the Peer. */ int mmsMsgCount; /**< Indicates the MMS messages from the Peer. */ -}MSG_THREAD_COUNT_INFO_S; +} MSG_THREAD_COUNT_INFO_S; /** * @brief Represents the request information of Push Message (SI, SL). */ -typedef struct -{ - msg_push_action_t action; +typedef struct { + msg_push_action_t action; unsigned long received; unsigned long created; unsigned long expires; @@ -256,8 +241,7 @@ typedef struct /** * @brief Represents the request information of Push Message (CO). */ -typedef struct -{ +typedef struct { int invalObjectCnt; int invalServiceCnt; char invalObjectUrl[MAX_PUSH_CACHEOP_INVALID_OBJECT_MAX][MAX_PUSH_CACHEOP_MAX_URL_LEN + 1]; @@ -268,53 +252,48 @@ typedef struct /** * @brief Represents the SyncML Message Information. */ -typedef struct -{ +typedef struct { int extId; int pinCode; msg_struct_t msg; -}MSG_SYNCML_MESSAGE_S; +} MSG_SYNCML_MESSAGE_S; /** * @brief Represents the SyncML Message Data. */ - typedef struct -{ - msg_syncml_message_type_t syncmlType; - int pushBodyLen; - char pushBody[MAX_WAPPUSH_CONTENTS_LEN + 1]; - int wspHeaderLen; - char wspHeader[MAX_WAPPUSH_CONTENTS_LEN + 1]; - int simIndex; -}MSG_SYNCML_MESSAGE_DATA_S; +typedef struct { + msg_syncml_message_type_t syncmlType; + int pushBodyLen; + char pushBody[MAX_WAPPUSH_CONTENTS_LEN + 1]; + int wspHeaderLen; + char wspHeader[MAX_WAPPUSH_CONTENTS_LEN + 1]; + int simIndex; +} MSG_SYNCML_MESSAGE_DATA_S; /** * @brief Represents the SyncML Message Data. */ - typedef struct -{ +typedef struct { char pushHeader[MAX_WAPPUSH_CONTENTS_LEN + 1]; - int pushBodyLen; + int pushBodyLen; char pushBody[MAX_WAPPUSH_CONTENTS_LEN + 1]; -}MSG_LBS_MESSAGE_DATA_S; +} MSG_LBS_MESSAGE_DATA_S; -typedef struct -{ +typedef struct { char pushHeader[MAX_WAPPUSH_CONTENTS_LEN + 1]; - int pushBodyLen; + int pushBodyLen; char pushBody[MAX_WAPPUSH_CONTENTS_LEN + 1]; char pushAppId[MAX_WAPPUSH_ID_LEN + 1]; char pushContentType[MAX_WAPPUSH_CONTENT_TYPE_LEN + 1]; -}MSG_PUSH_MESSAGE_DATA_S; +} MSG_PUSH_MESSAGE_DATA_S; /** * @brief Represents the Report Status Data. */ -typedef struct -{ +typedef struct { char addressVal[MAX_ADDRESS_VAL_LEN + 1]; int type; int status; @@ -322,17 +301,15 @@ typedef struct } MSG_REPORT_STATUS_INFO_S; -typedef struct -{ +typedef struct { char contentType[MAX_WAPPUSH_CONTENT_TYPE_LEN + 1]; char appId[MAX_WAPPUSH_ID_LEN + 1]; char pkgName[MSG_FILEPATH_LEN_MAX + 1]; bool bLaunch; -}MSG_PUSH_EVENT_INFO_S; +} MSG_PUSH_EVENT_INFO_S; -typedef struct -{ +typedef struct { msg_message_id_t msg_id; char mime_type[MAX_MIME_TYPE_LEN+1]; char media_item[MSG_FILEPATH_LEN_MAX+1]; diff --git a/include/externals/MsgAlarm.h b/include/externals/MsgAlarm.h index f125515..fa31014 100755 --- a/include/externals/MsgAlarm.h +++ b/include/externals/MsgAlarm.h @@ -21,13 +21,13 @@ #include "MsgTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ typedef void (*msg_alarm_cb)(int alarmId); /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgAlarmRegistration(struct tm *timeInfo, msg_alarm_cb userCB, int *alarmId); msg_error_t MsgAlarmRemove(int alarmId); diff --git a/include/externals/MsgLbs.h b/include/externals/MsgLbs.h index ff24ebf..7332ab3 100755 --- a/include/externals/MsgLbs.h +++ b/include/externals/MsgLbs.h @@ -18,17 +18,17 @@ #define MSGLBS_H_ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define MSG_LBS_PORT 7275 /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ void MsgLbsSms(const char *msgBody, int msgSize); void MsgLbsWapPush(const char *pushHeader, const char *pushBody, int pushBodySize); diff --git a/include/externals/MsgNotificationWrapper.h b/include/externals/MsgNotificationWrapper.h index f7776ad..cfc27a3 100755 --- a/include/externals/MsgNotificationWrapper.h +++ b/include/externals/MsgNotificationWrapper.h @@ -18,12 +18,12 @@ #define MSG_NOTIFICATION_WRAPPER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgInternalTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define MSG_APP_PACKAGE_NAME "message" @@ -87,8 +87,7 @@ enum _msg_active_notification_type_e { MSG_ACTIVE_NOTI_TYPE_INSTANT, }; -enum _MSG_SOUND_TYPE_E -{ +enum _MSG_SOUND_TYPE_E { MSG_SOUND_PLAY_DEFAULT = 0, MSG_SOUND_PLAY_USER, MSG_SOUND_PLAY_EMERGENCY, diff --git a/include/externals/MsgSensorWrapper.h b/include/externals/MsgSensorWrapper.h index 8a6bc57..f0e7c7c 100755 --- a/include/externals/MsgSensorWrapper.h +++ b/include/externals/MsgSensorWrapper.h @@ -21,13 +21,13 @@ #include "MsgTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ typedef void (*msg_sensor_cb)(); /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ void MsgInitSensor(); diff --git a/include/externals/MsgSpamFilter.h b/include/externals/MsgSpamFilter.h index beba140..571398c 100755 --- a/include/externals/MsgSpamFilter.h +++ b/include/externals/MsgSpamFilter.h @@ -18,7 +18,7 @@ #define MSG_SPAM_FILTER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgFilterTypes.h" #include "MsgStorageTypes.h" @@ -27,7 +27,7 @@ /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgSetFilterOperation(bool bSetFlag); msg_error_t MsgGetFilterOperation(bool *pSetFlag); diff --git a/include/framework/MsgCmdHandler.h b/include/framework/MsgCmdHandler.h index 4082cfa..f5b9536 100755 --- a/include/framework/MsgCmdHandler.h +++ b/include/framework/MsgCmdHandler.h @@ -18,14 +18,14 @@ #define MSG_CMD_HANDLER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgCmdTypes.h" #include "MsgInternalTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ int MsgAddMessageHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgAddSyncMLMessageHandler(const MSG_CMD_S *pCmd, char **ppEvent); diff --git a/include/framework/MsgDeliverHandler.h b/include/framework/MsgDeliverHandler.h index b18a97e..113f98d 100755 --- a/include/framework/MsgDeliverHandler.h +++ b/include/framework/MsgDeliverHandler.h @@ -18,14 +18,14 @@ #define MSG_DELIVER_HANDLER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgPluginInterface.h" #include "MsgTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgHandleMmsConfIncomingMsg(MSG_MESSAGE_INFO_S *pMsgInfo, msg_request_id_t reqID); msg_error_t MsgHandleIncomingMsg(MSG_MESSAGE_INFO_S *pMsgInfo, bool *pSendNoti); diff --git a/include/framework/MsgPluginManager.h b/include/framework/MsgPluginManager.h index f440a4a..25ec2ff 100755 --- a/include/framework/MsgPluginManager.h +++ b/include/framework/MsgPluginManager.h @@ -18,7 +18,7 @@ #define MSG_PLUGIN_MANAGER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <map> @@ -27,12 +27,12 @@ #include "MsgCppTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgPlugin { @@ -72,19 +72,19 @@ public: msg_error_t restoreMsg(MSG_MESSAGE_INFO_S *pMsgInfo, char* pRecvBody, int rcvdBodyLen, char* filePath); operator void*() const { - return (mSupportedMsg == MSG_UNKNOWN_TYPE)? NULL:(void*) this; + return (mSupportedMsg == MSG_UNKNOWN_TYPE) ? NULL:(void*) this; } private: - MSG_MAIN_TYPE_T mSupportedMsg; - MSG_PLUGIN_HANDLER_S mPlgHandler; + MSG_MAIN_TYPE_T mSupportedMsg; + MSG_PLUGIN_HANDLER_S mPlgHandler; void *mLibHandler; /* plugin library pointer */ }; /*================================================================================================== - GLOBAL VARIABLES + GLOBAL VARIABLES ==================================================================================================*/ typedef std::map<MSG_MAIN_TYPE_T, MsgPlugin*> MsgPluginMap; @@ -93,14 +93,14 @@ typedef struct { const char *path; } MSG_PLG_TABLE_T; -const static MSG_PLG_TABLE_T __msg_plg_items[] = { +static const MSG_PLG_TABLE_T __msg_plg_items[] = { { MSG_SMS_TYPE, "/usr/lib/libmsg_sms_plugin.so" }, { MSG_MMS_TYPE, "/usr/lib/libmsg_mms_plugin.so" } }; /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgPluginManager { diff --git a/include/framework/MsgSettingHandler.h b/include/framework/MsgSettingHandler.h index b6ce6a2..a54b2db 100755 --- a/include/framework/MsgSettingHandler.h +++ b/include/framework/MsgSettingHandler.h @@ -19,13 +19,13 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgSettingTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgSetConfigData(const MSG_SETTING_S *pSetting); msg_error_t MsgGetConfigData(MSG_SETTING_S *pSetting); diff --git a/include/framework/MsgStorageHandler.h b/include/framework/MsgStorageHandler.h index 728e7fe..ffcdc9b 100755 --- a/include/framework/MsgStorageHandler.h +++ b/include/framework/MsgStorageHandler.h @@ -18,7 +18,7 @@ #define MSG_STORAGE_HANDLER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgSettingTypes.h" @@ -28,7 +28,7 @@ #include "MsgInternalTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgStoConnectDB(); msg_error_t MsgStoDisconnectDB(); diff --git a/include/framework/MsgSubmitHandler.h b/include/framework/MsgSubmitHandler.h index bb5c888..62e713d 100755 --- a/include/framework/MsgSubmitHandler.h +++ b/include/framework/MsgSubmitHandler.h @@ -19,13 +19,13 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgInternalTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgSubmitReq(MSG_REQUEST_INFO_S* pReq, bool bScheduled); msg_error_t MsgSubmitReqSMS(MSG_REQUEST_INFO_S *pReqInfo); diff --git a/include/framework/MsgTransManager.h b/include/framework/MsgTransManager.h index 38699a6..7f8413f 100755 --- a/include/framework/MsgTransManager.h +++ b/include/framework/MsgTransManager.h @@ -19,7 +19,7 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <list> #include <map> @@ -38,7 +38,7 @@ /*================================================================================================== - DEFINITION + DEFINITION ==================================================================================================*/ typedef std::map<MSG_CMD_TYPE_T, int (*)(const MSG_CMD_S*, char**)> handler_map; typedef std::map<int, MSG_PROXY_INFO_S> sentmsg_map; @@ -54,7 +54,7 @@ typedef std::list<MSG_CMD_REG_SYNCML_MSG_OPERATION_CB_S> syncmlop_list; /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgTransactionManager { @@ -62,7 +62,7 @@ public: static MsgTransactionManager* instance(); void run(); - void workerEventQueue(); + void workerEventQueue(); void write(int fd, const char* buf, int len); /* methods for sent status event */ @@ -82,7 +82,7 @@ public: void setStorageChangeCB(int listenerFd); void setReportMsgCB(int listenerFd); - javamms_list& getJavaMMSList(); + javamms_list &getJavaMMSList(); void broadcastIncomingMsgCB(const msg_error_t err, const MSG_MESSAGE_INFO_S *msgInfo); void broadcastMMSConfCB(const msg_error_t err, const MSG_MESSAGE_INFO_S *msgInfo, const MMS_RECV_DATA_S *mmsRecvData); diff --git a/include/mapi/msg.h b/include/mapi/msg.h index d824233..dabf215 100755 --- a/include/mapi/msg.h +++ b/include/mapi/msg.h @@ -18,14 +18,14 @@ #define MSG_H_ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <stdbool.h> #include "msg_types.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ /** @@ -44,7 +44,7 @@ extern "C" #endif /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ /** diff --git a/include/mapi/msg_private.h b/include/mapi/msg_private.h index a24287e..d5a011e 100755 --- a/include/mapi/msg_private.h +++ b/include/mapi/msg_private.h @@ -18,7 +18,7 @@ #define MSG_PRIVATE_H_ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgDebug.h" @@ -32,7 +32,7 @@ #include "MsgUtilFunction.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define CHECK_MSG_SUPPORTED(feature_name) \ @@ -56,7 +56,7 @@ } while (0) /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ /* message */ diff --git a/include/mapi/msg_storage.h b/include/mapi/msg_storage.h index f7d2471..52fe33e 100755 --- a/include/mapi/msg_storage.h +++ b/include/mapi/msg_storage.h @@ -18,7 +18,7 @@ #define MAPI_STORAGE_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "msg_storage_types.h" @@ -63,7 +63,7 @@ extern "C" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ /** @@ -1185,5 +1185,5 @@ int msg_db_free(msg_handle_t handle, char **db_res); } #endif -#endif // MAPI_STORAGE_H +#endif /* MAPI_STORAGE_H */ diff --git a/include/mapi/msg_storage_types.h b/include/mapi/msg_storage_types.h index 60d5545..8a740df 100755 --- a/include/mapi/msg_storage_types.h +++ b/include/mapi/msg_storage_types.h @@ -18,13 +18,13 @@ #define MSG_STORAGE_TYPES_H_ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "msg_types.h" /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ /** @@ -39,11 +39,11 @@ typedef struct { int nCount; /**< The count of message ID information */ msg_message_id_t *msgIdList; /**< The pointer to message ID information */ -}msg_id_list_s; +} msg_id_list_s; /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ /** @@ -96,7 +96,7 @@ typedef void (*msg_storage_change_cb)(msg_handle_t handle, msg_storage_change_ty /*================================================================================================== - ENUMS + ENUMS ==================================================================================================*/ /** @@ -135,8 +135,8 @@ enum _MSG_FOLDER_ID_E { enum _MSG_FOLDER_TYPE_E { MSG_FOLDER_TYPE_INBOX = 1, /**< Inbox folder */ MSG_FOLDER_TYPE_OUTBOX, /**< Outbox folder */ - MSG_FOLDER_TYPE_DRAFT, /**< Draft folder */ - MSG_FOLDER_TYPE_SPAMBOX, /**< Spambox folder */ + MSG_FOLDER_TYPE_DRAFT, /**< Draft folder */ + MSG_FOLDER_TYPE_SPAMBOX, /**< Spambox folder */ MSG_FOLDER_TYPE_USER_DEF /**< Folder which is created by a user */ }; diff --git a/include/mapi/msg_transport.h b/include/mapi/msg_transport.h index 9badbe7..dbedc18 100755 --- a/include/mapi/msg_transport.h +++ b/include/mapi/msg_transport.h @@ -18,7 +18,7 @@ #define MAPI_TRANSPORT_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "msg_transport_types.h" @@ -67,7 +67,7 @@ extern "C" */ /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ /** diff --git a/include/mapi/msg_transport_types.h b/include/mapi/msg_transport_types.h index 2bd4c2c..21a90aa 100755 --- a/include/mapi/msg_transport_types.h +++ b/include/mapi/msg_transport_types.h @@ -18,7 +18,7 @@ #define MSG_TRANSPORT_TYPES_H_ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "msg_types.h" @@ -31,7 +31,7 @@ /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ /** @brief Called when the status of the message which is already sent is changed. diff --git a/include/mapi/msg_types.h b/include/mapi/msg_types.h index c54f590..9f7771f 100755 --- a/include/mapi/msg_types.h +++ b/include/mapi/msg_types.h @@ -18,7 +18,7 @@ #define MSG_TYPES_H_ /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define DEPRECATED __attribute__((deprecated)) @@ -275,7 +275,7 @@ #define MAX_MIME_TYPE_LEN 64 /*================================================================================================== - TYPES + TYPES ==================================================================================================*/ /** @@ -297,9 +297,9 @@ typedef struct msg_list_handle *msg_list_handle_t; * @brief The structure type representing a message structure list. */ typedef struct { - int nCount; /**< The count of #msg_struct_t */ - msg_struct_t *msg_struct_info; /**< The #msg_struct_t information list */ -}msg_struct_list_s; + int nCount; /**< The count of #msg_struct_t */ + msg_struct_t *msg_struct_info; /**< The #msg_struct_t information list */ +} msg_struct_list_s; /** @@ -450,7 +450,7 @@ typedef unsigned char msg_filter_type_t; /*================================================================================================== - ENUMS + ENUMS ==================================================================================================*/ /** @@ -1156,9 +1156,9 @@ enum _MSG_CLASS_TYPE_E { * This enum is used as the value of msg_message_type_t. */ enum _MSG_MESSAGE_TYPE_E { - MSG_TYPE_INVALID = 0, /** < Invalid Type Message */ + MSG_TYPE_INVALID = 0, /** < Invalid Type Message */ - MSG_TYPE_SMS, /** < Normal SMS Message */ + MSG_TYPE_SMS, /** < Normal SMS Message */ MSG_TYPE_SMS_CB, /** < Cell Broadcasting SMS Message */ MSG_TYPE_SMS_JAVACB, /** < JAVA Cell Broadcasting SMS Message */ MSG_TYPE_SMS_WAPPUSH, /** < WAP Push SMS Message */ @@ -1407,8 +1407,8 @@ enum _MSG_PUSH_ACTION_E { * @brief Enumeration for the type of SyncML Message. \n * This enum is used as the value of msg_syncml_message_type_t. */ - enum _MSG_SYNCML_MESSAGE_TYPE_E { - DM_WBXML, /** < DM WBXML SyncML Message */ +enum _MSG_SYNCML_MESSAGE_TYPE_E { + DM_WBXML, /** < DM WBXML SyncML Message */ DM_XML, /** < DM XML SyncML Message */ DM_NOTIFICATION, /** < DM Notification SyncML Message */ @@ -1419,25 +1419,25 @@ enum _MSG_PUSH_ACTION_E { CP_WBXML, /** < CP WBXML SyncML Message */ OTHERS, /** < Unknown SyncML Message */ - }; +}; /** * @brief Enumeration for the values of a Delivery Report Status. \n * This enum is used as the value of msg_delivery_report_status_t. */ - enum _MSG_DELIVERY_REPORT_STATUS_E { - MSG_DELIVERY_REPORT_NONE = -1, /**< Indicates the status unavailable */ - MSG_DELIVERY_REPORT_EXPIRED = 0, /**< Indicates the expired status of message */ - MSG_DELIVERY_REPORT_SUCCESS = 1, /**< Indicates the success status of message */ - MSG_DELIVERY_REPORT_REJECTED = 2, /**< Indicates the rejected status of message */ - MSG_DELIVERY_REPORT_DEFERRED = 3, /**< Indicates the deferred status of message */ - MSG_DELIVERY_REPORT_UNRECOGNISED = 4, /**< Indicates the unrecognized status of message */ - MSG_DELIVERY_REPORT_INDETERMINATE = 5, /**< Indicates the intermediate status of message */ - MSG_DELIVERY_REPORT_FORWARDED = 6, /**< Indicates the forwarded status of message */ - MSG_DELIVERY_REPORT_UNREACHABLE = 7, /**< Indicates the unreachable status of message */ - MSG_DELIVERY_REPORT_ERROR = 8, /**< Indicates the error status of message */ - }; +enum _MSG_DELIVERY_REPORT_STATUS_E { + MSG_DELIVERY_REPORT_NONE = -1, /**< Indicates the status unavailable */ + MSG_DELIVERY_REPORT_EXPIRED = 0, /**< Indicates the expired status of message */ + MSG_DELIVERY_REPORT_SUCCESS = 1, /**< Indicates the success status of message */ + MSG_DELIVERY_REPORT_REJECTED = 2, /**< Indicates the rejected status of message */ + MSG_DELIVERY_REPORT_DEFERRED = 3, /**< Indicates the deferred status of message */ + MSG_DELIVERY_REPORT_UNRECOGNISED = 4, /**< Indicates the unrecognized status of message */ + MSG_DELIVERY_REPORT_INDETERMINATE = 5, /**< Indicates the intermediate status of message */ + MSG_DELIVERY_REPORT_FORWARDED = 6, /**< Indicates the forwarded status of message */ + MSG_DELIVERY_REPORT_UNREACHABLE = 7, /**< Indicates the unreachable status of message */ + MSG_DELIVERY_REPORT_ERROR = 8, /**< Indicates the error status of message */ +}; /** @@ -1445,21 +1445,21 @@ enum _MSG_PUSH_ACTION_E { * This enum is used as the value of msg_read_report_status_t. */ enum _MSG_READ_REPORT_STATUS_E { - MSG_READ_REPORT_NONE = -1, /**< Indicates the status unavailable */ - MSG_READ_REPORT_IS_READ = 0, /**< Indicates the message is read */ - MSG_READ_REPORT_IS_DELETED = 1, /**< Indicates the message is deleted */ - MSG_READ_REPORT_REJECT_BY_USER = 2, /**< Indicates read report reject by user*/ - }; + MSG_READ_REPORT_NONE = -1, /**< Indicates the status unavailable */ + MSG_READ_REPORT_IS_READ = 0, /**< Indicates the message is read */ + MSG_READ_REPORT_IS_DELETED = 1, /**< Indicates the message is deleted */ + MSG_READ_REPORT_REJECT_BY_USER = 2, /**< Indicates read report reject by user*/ +}; /** * @brief Enumeration for the values of a Report Type. \n * This enum is used as the value of msg_read_report_status_t. */ enum _MSG_REPORT_TYPE_E { - MSG_REPORT_TYPE_DELIVERY = 0, /**< Indicates the type is delivery report*/ - MSG_REPORT_TYPE_READ = 1, /**< Indicates the type is read report*/ - MSG_REPORT_TYPE_READ_REPORT_SENT = 2, /**< Indicates the type is read report sent*/ - }; + MSG_REPORT_TYPE_DELIVERY = 0, /**< Indicates the type is delivery report*/ + MSG_REPORT_TYPE_READ = 1, /**< Indicates the type is read report*/ + MSG_REPORT_TYPE_READ_REPORT_SENT = 2, /**< Indicates the type is read report sent*/ +}; /* filter */ /** @@ -1575,7 +1575,7 @@ typedef enum _MimeType { MIME_AUDIO_XMF = 0x201a, /**< Indicates the audio xmf type */ MIME_AUDIO_IMY = 0x201b, /**< Indicates the audio imy type */ MIME_AUDIO_MOBILE_XMF = 0x201c, /**< Indicates the audio mobile xmf type */ - MIME_AUDIO_OGG = 0x201d, /**< Indicates the audio mobile xmf type */ + MIME_AUDIO_OGG = 0x201d, /**< Indicates the audio mobile xmf type */ /* 86 */ MIME_AUDIO_VND_RN_REALAUDIO = 0x2100, /**< Indicates the audio rn real audio type */ @@ -1700,7 +1700,7 @@ typedef enum { MSG_DRM_TYPE_CD = 2, /**< Indicates the combined delivery */ /* 2004-07-09: combined delivery type */ MSG_DRM_TYPE_SD = 3, /**< Indicates the separate delivery */ /* 2004-07-09: seperate delivery type */ MSG_DRM_TYPE_SSD = 4 /**< Indicates the special separate delivery */ /* 2005-02-28: add Special Sperate Delivery */ -}MsgDrmType; +} MsgDrmType; /** * @brief Enumeration for the values of a SMIL region type. @@ -1708,7 +1708,7 @@ typedef enum { typedef enum _REGION_FIT_TYPE_T { MMSUI_IMAGE_REGION_FIT_HIDDEN, /**< Indicates the hidden fit type */ MMSUI_IMAGE_REGION_FIT_MEET, /**< Indicates the meet fit type */ -}REGION_FIT_TYPE_T; +} REGION_FIT_TYPE_T; /** @@ -1723,7 +1723,7 @@ typedef enum { MMS_SMIL_MEDIA_ANIMATE, /**< Indicates the animation media */ MMS_SMIL_MEDIA_IMG_OR_VIDEO , /**< Indicates the image or video media */ MMS_SMIL_MEDIA_MAX = 0xffffffff, /**< Indicates the maximum media type */ -}MmsSmilMediaType; +} MmsSmilMediaType; /** * @brief Enumeration for the values of a SMIL transition type. @@ -1737,11 +1737,11 @@ typedef enum { MMS_SMIL_TRANS_RANDOMBLOCK = 5, /**< Indicates the random block transition */ MMS_SMIL_TRANS_ZOOMIN = 6, /**< Indicates the zoom in transition */ MMS_SMIL_TRANS_IRISWIPE = 7, /**< Indicates the iris wipe transition */ - MMS_SMIL_TRANS_BOXWIPE = 8, /**< Indicates the box wipe transition */ + MMS_SMIL_TRANS_BOXWIPE = 8, /**< Indicates the box wipe transition */ MMS_SMIL_TRANS_FOURBOXWIPE = 9, /**< Indicates the four box wipe transition */ MMS_SMIL_TRANS_PUSHWIPE = 10, /**< Indicates the push wipe transition */ MMS_SMIL_TRANS_ELLIPSEWIPE = 11 /**< Indicates the ellipse wipe transition */ -}MmsSmilTransType; +} MmsSmilTransType; /** * @brief Enumeration for the values of a SMIL transition sub type. @@ -1756,7 +1756,7 @@ typedef enum { MMS_SMIL_TRANS_SUB_HORIZONTAL = 6, /**< Indicates the horizontal transition */ /* barDoorWipe's default */ MMS_SMIL_TRANS_SUB_FROM_RIGHT = 7, /**< Indicates the from right transition */ MMS_SMIL_TRANS_SUB_VERTICAL = 8 /**< Indicates the vertical transition */ -}MmsSmilTransSubType; +} MmsSmilTransSubType; /** * @brief Enumeration for the values of a text font type. @@ -1767,7 +1767,7 @@ typedef enum { MMS_SMIL_FONT_TYPE_ITALIC = 2, /**< Indicates the font type italic */ MMS_SMIL_FONT_TYPE_BOLD = 3, /**< Indicates the font type bold */ MMS_SMIL_FONT_TYPE_UNDERLINE = 4 /**< Indicates the font type underline */ -}MmsSmilFontType; +} MmsSmilFontType; /** * @brief Enumeration for the values of a MMS text direction. diff --git a/include/proxy/MsgHandle.h b/include/proxy/MsgHandle.h index bf6d0c2..816013e 100755 --- a/include/proxy/MsgHandle.h +++ b/include/proxy/MsgHandle.h @@ -22,7 +22,7 @@ #endif /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgTransportTypes.h" @@ -34,142 +34,142 @@ #include "MsgMutex.h" /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgHandle { - public: - MsgHandle(); - virtual ~MsgHandle(); - - /* Control */ - void openHandle(); - void closeHandle(MsgHandle* pHandle); - - /* Transport */ - msg_error_t submitReq(MSG_REQUEST_S* pReq); - - msg_error_t regSentStatusCallback(msg_sent_status_cb onStatusChanged, void *pUserParam); - msg_error_t regSmsMessageCallback(msg_sms_incoming_cb onMsgIncoming, unsigned short port, void *pUserParam); - msg_error_t regMmsConfMessageCallback(msg_mms_conf_msg_incoming_cb onMMSConfMsgIncoming, const char *pAppId, void *pUserParam); - msg_error_t regSyncMLMessageCallback(msg_syncml_msg_incoming_cb onSyncMLMsgIncoming, void *pUserParam); - msg_error_t regLBSMessageCallback(msg_lbs_msg_incoming_cb onLBSMsgIncoming, void *pUserParam); - msg_error_t regPushMessageCallback(msg_push_msg_incoming_cb onPushMsgIncoming, const char *pAppId, void *pUserParam); - msg_error_t regCBMessageCallback(msg_cb_incoming_cb onCBIncoming, bool bSave, void *pUserParam); - msg_error_t regSyncMLMessageOperationCallback(msg_syncml_msg_operation_cb onSyncMLMsgOperation, void *pUserParam); - msg_error_t regReportMessageCallback(msg_report_msg_incoming_cb onReportMsgCB, void *pUserParam); - - msg_error_t operateSyncMLMessage(msg_message_id_t msgId); - - /* Storage */ - int addMessage(MSG_MESSAGE_HIDDEN_S *pMsg, const MSG_SENDINGOPT_S *pSendOpt); - msg_error_t addSyncMLMessage(const MSG_SYNCML_MESSAGE_S *pSyncMLMsg); - msg_error_t updateMessage(const MSG_MESSAGE_HIDDEN_S *pMsg, const MSG_SENDINGOPT_S *pSendOpt); - msg_error_t updateReadStatus(msg_message_id_t MsgId, bool bRead); - msg_error_t setConversationToRead(msg_thread_id_t ThreadId); - msg_error_t updateProtectedStatus(msg_message_id_t MsgId, bool bProtected); - msg_error_t deleteMessage(msg_message_id_t MsgId); - msg_error_t deleteAllMessagesInFolder(msg_folder_id_t FolderId, bool bOnlyDB); - msg_error_t deleteMessagesByList(msg_id_list_s *pMsgIdList); - msg_error_t moveMessageToFolder(msg_message_id_t MsgId, msg_folder_id_t DestFolderId); - msg_error_t moveMessageToStorage(msg_message_id_t MsgId, msg_storage_id_t DestStorageId); - msg_error_t countMessage(msg_folder_id_t FolderId, MSG_COUNT_INFO_S *pCountInfo); - msg_error_t countMsgByType(const MSG_MESSAGE_TYPE_S *pMsgType, int *pMsgCount); - msg_error_t countMsgByContact(const MSG_THREAD_LIST_INDEX_INFO_S *pAddrInfo, MSG_THREAD_COUNT_INFO_S *pMsgThreadCountList); - msg_error_t getMessage(msg_message_id_t MsgId, MSG_MESSAGE_HIDDEN_S *pMsg, MSG_SENDINGOPT_S *pSendOpt); - msg_error_t getConversationViewItem(msg_message_id_t MsgId, MSG_CONVERSATION_VIEW_S *pConv); - msg_error_t addFolder(const MSG_FOLDER_INFO_S *pFolderInfo); - msg_error_t updateFolder(const MSG_FOLDER_INFO_S *pFolderInfo); - msg_error_t deleteFolder(msg_folder_id_t FolderId); - msg_error_t getFolderList(msg_struct_list_s *pFolderList); - - msg_error_t getThreadViewList(const MSG_SORT_RULE_S *pSortRule, msg_struct_list_s *pThreadViewList); - msg_error_t getConversationViewList(msg_thread_id_t ThreadId, msg_struct_list_s *pConvViewList); - msg_error_t deleteThreadMessageList(msg_thread_id_t thread_id, bool include_protected_msg); - msg_error_t getQuickPanelData(msg_quickpanel_type_t Type, MSG_MESSAGE_HIDDEN_S *pMsg); - msg_error_t resetDatabase(); - msg_error_t getMemSize(unsigned int* memsize); - - msg_error_t getAddressList(const msg_thread_id_t threadId, msg_struct_list_s *pAddrList); - - /* Filter */ - msg_error_t addFilter(const MSG_FILTER_S *pFilter); - msg_error_t updateFilter(const MSG_FILTER_S *pFilter); - msg_error_t deleteFilter(msg_filter_id_t FilterId); - msg_error_t getFilterList(msg_struct_list_s *pFilterList); - msg_error_t setFilterOperation(bool bSetFlag); - msg_error_t getFilterOperation(bool *pSetFlag); - msg_error_t setFilterActivation(msg_filter_id_t filter_id, bool active); - - /*setting */ - msg_error_t getSMSCOption(msg_struct_t msg_struct); - msg_error_t setSMSCOption(msg_struct_t msg_struct); - msg_error_t getCBOption(msg_struct_t msg_struct); - msg_error_t setCBOption(msg_struct_t msg_struct); - msg_error_t getSmsSendOpt(msg_struct_t msg_struct); - msg_error_t setSmsSendOpt(msg_struct_t msg_struct); - msg_error_t getMmsSendOpt(msg_struct_t msg_struct); - msg_error_t setMmsSendOpt(msg_struct_t msg_struct); - msg_error_t getMmsRecvOpt(msg_struct_t msg_struct); - msg_error_t setMmsRecvOpt(msg_struct_t msg_struct); - msg_error_t getPushMsgOpt(msg_struct_t msg_struct); - msg_error_t setPushMsgOpt(msg_struct_t msg_struct); - msg_error_t getVoiceMsgOpt(msg_struct_t msg_struct); - msg_error_t setVoiceMsgOpt(msg_struct_t msg_struct); - msg_error_t getGeneralOpt(msg_struct_t msg_struct); - msg_error_t setGeneralOpt(msg_struct_t msg_struct); - msg_error_t getMsgSizeOpt(msg_struct_t msg_struct); - msg_error_t setMsgSizeOpt(msg_struct_t msg_struct); - - /*Backup & Restore */ - msg_error_t backupMessage(msg_message_backup_type_t type, const char *backup_filepath); - msg_error_t restoreMessage(const char *backup_filepath); - msg_error_t getVobject(msg_message_id_t MsgId, void** encodedData); - /* ETC */ - msg_error_t searchMessage(const char *pSearchString, msg_struct_list_s *pThreadViewList); - - - msg_error_t dbSelectWithQuery(const char *query, char ***db_res, int *row_count, int *col_count); - void dbFree(char **db_res); - - msg_error_t getRejectMsgList(const char *pNumber, msg_struct_list_s *pRejectMsgList); - msg_error_t regStorageChangeCallback(msg_storage_change_cb onStorageChange, void *pUserParam); - msg_error_t getReportStatus(msg_message_id_t msg_id, msg_struct_list_s *report_list); - msg_error_t getThreadIdByAddress(msg_struct_list_s *pAddrList, msg_thread_id_t *pThreadId); - msg_error_t getThreadIdByAddress(msg_list_handle_t msg_address_list, msg_thread_id_t *pThreadId); - msg_error_t getThread(msg_thread_id_t threadId, MSG_THREAD_VIEW_S* pThreadInfo); - msg_error_t getMessageList(const MSG_LIST_CONDITION_S *pListCond, msg_struct_list_s *pMsgList); - msg_error_t getMediaList(const msg_thread_id_t thread_id, msg_list_handle_t *pMediaList); - - /* Push Event */ - msg_error_t addPushEvent(MSG_PUSH_EVENT_INFO_S *push_event); - msg_error_t deletePushEvent(MSG_PUSH_EVENT_INFO_S *push_event); - msg_error_t updatePushEvent(MSG_PUSH_EVENT_INFO_S *pSrc, MSG_PUSH_EVENT_INFO_S *pDst); - - void convertMsgStruct(const MSG_MESSAGE_INFO_S *pSource, MSG_MESSAGE_HIDDEN_S *pDest); - void convertSendOptStruct(const MSG_SENDINGOPT_INFO_S* pSrc, MSG_SENDINGOPT_S* pDest, MSG_MESSAGE_TYPE_S msgType); - - void connectSocket(); - void disconnectSocket(); - - private: - void write(const char *pCmd, int CmdSize, char **ppEvent); - void read(char **ppEvent); - void generateConnectionId(char *ConnectionId); - void convertMsgStruct(const MSG_MESSAGE_HIDDEN_S *pSource, MSG_MESSAGE_INFO_S *pDest); - void convertSendOptStruct(const MSG_SENDINGOPT_S* pSrc, MSG_SENDINGOPT_INFO_S* pDest, MSG_MESSAGE_TYPE_S msgType); - int getSettingCmdSize(MSG_OPTION_TYPE_T optionType); - bool checkEventData(char *pEventData); - msg_error_t checkPermission(void); - - char mConnectionId[20]; - short mCounter; - - char mCookie[MAX_COOKIE_LEN]; - - MsgIpcClientSocket mClientSock; - MsgMutex mx; +public: + MsgHandle(); + virtual ~MsgHandle(); + + /* Control */ + void openHandle(); + void closeHandle(MsgHandle* pHandle); + + /* Transport */ + msg_error_t submitReq(MSG_REQUEST_S* pReq); + + msg_error_t regSentStatusCallback(msg_sent_status_cb onStatusChanged, void *pUserParam); + msg_error_t regSmsMessageCallback(msg_sms_incoming_cb onMsgIncoming, unsigned short port, void *pUserParam); + msg_error_t regMmsConfMessageCallback(msg_mms_conf_msg_incoming_cb onMMSConfMsgIncoming, const char *pAppId, void *pUserParam); + msg_error_t regSyncMLMessageCallback(msg_syncml_msg_incoming_cb onSyncMLMsgIncoming, void *pUserParam); + msg_error_t regLBSMessageCallback(msg_lbs_msg_incoming_cb onLBSMsgIncoming, void *pUserParam); + msg_error_t regPushMessageCallback(msg_push_msg_incoming_cb onPushMsgIncoming, const char *pAppId, void *pUserParam); + msg_error_t regCBMessageCallback(msg_cb_incoming_cb onCBIncoming, bool bSave, void *pUserParam); + msg_error_t regSyncMLMessageOperationCallback(msg_syncml_msg_operation_cb onSyncMLMsgOperation, void *pUserParam); + msg_error_t regReportMessageCallback(msg_report_msg_incoming_cb onReportMsgCB, void *pUserParam); + + msg_error_t operateSyncMLMessage(msg_message_id_t msgId); + + /* Storage */ + int addMessage(MSG_MESSAGE_HIDDEN_S *pMsg, const MSG_SENDINGOPT_S *pSendOpt); + msg_error_t addSyncMLMessage(const MSG_SYNCML_MESSAGE_S *pSyncMLMsg); + msg_error_t updateMessage(const MSG_MESSAGE_HIDDEN_S *pMsg, const MSG_SENDINGOPT_S *pSendOpt); + msg_error_t updateReadStatus(msg_message_id_t MsgId, bool bRead); + msg_error_t setConversationToRead(msg_thread_id_t ThreadId); + msg_error_t updateProtectedStatus(msg_message_id_t MsgId, bool bProtected); + msg_error_t deleteMessage(msg_message_id_t MsgId); + msg_error_t deleteAllMessagesInFolder(msg_folder_id_t FolderId, bool bOnlyDB); + msg_error_t deleteMessagesByList(msg_id_list_s *pMsgIdList); + msg_error_t moveMessageToFolder(msg_message_id_t MsgId, msg_folder_id_t DestFolderId); + msg_error_t moveMessageToStorage(msg_message_id_t MsgId, msg_storage_id_t DestStorageId); + msg_error_t countMessage(msg_folder_id_t FolderId, MSG_COUNT_INFO_S *pCountInfo); + msg_error_t countMsgByType(const MSG_MESSAGE_TYPE_S *pMsgType, int *pMsgCount); + msg_error_t countMsgByContact(const MSG_THREAD_LIST_INDEX_INFO_S *pAddrInfo, MSG_THREAD_COUNT_INFO_S *pMsgThreadCountList); + msg_error_t getMessage(msg_message_id_t MsgId, MSG_MESSAGE_HIDDEN_S *pMsg, MSG_SENDINGOPT_S *pSendOpt); + msg_error_t getConversationViewItem(msg_message_id_t MsgId, MSG_CONVERSATION_VIEW_S *pConv); + msg_error_t addFolder(const MSG_FOLDER_INFO_S *pFolderInfo); + msg_error_t updateFolder(const MSG_FOLDER_INFO_S *pFolderInfo); + msg_error_t deleteFolder(msg_folder_id_t FolderId); + msg_error_t getFolderList(msg_struct_list_s *pFolderList); + + msg_error_t getThreadViewList(const MSG_SORT_RULE_S *pSortRule, msg_struct_list_s *pThreadViewList); + msg_error_t getConversationViewList(msg_thread_id_t ThreadId, msg_struct_list_s *pConvViewList); + msg_error_t deleteThreadMessageList(msg_thread_id_t thread_id, bool include_protected_msg); + msg_error_t getQuickPanelData(msg_quickpanel_type_t Type, MSG_MESSAGE_HIDDEN_S *pMsg); + msg_error_t resetDatabase(); + msg_error_t getMemSize(unsigned int* memsize); + + msg_error_t getAddressList(const msg_thread_id_t threadId, msg_struct_list_s *pAddrList); + + /* Filter */ + msg_error_t addFilter(const MSG_FILTER_S *pFilter); + msg_error_t updateFilter(const MSG_FILTER_S *pFilter); + msg_error_t deleteFilter(msg_filter_id_t FilterId); + msg_error_t getFilterList(msg_struct_list_s *pFilterList); + msg_error_t setFilterOperation(bool bSetFlag); + msg_error_t getFilterOperation(bool *pSetFlag); + msg_error_t setFilterActivation(msg_filter_id_t filter_id, bool active); + + /*setting */ + msg_error_t getSMSCOption(msg_struct_t msg_struct); + msg_error_t setSMSCOption(msg_struct_t msg_struct); + msg_error_t getCBOption(msg_struct_t msg_struct); + msg_error_t setCBOption(msg_struct_t msg_struct); + msg_error_t getSmsSendOpt(msg_struct_t msg_struct); + msg_error_t setSmsSendOpt(msg_struct_t msg_struct); + msg_error_t getMmsSendOpt(msg_struct_t msg_struct); + msg_error_t setMmsSendOpt(msg_struct_t msg_struct); + msg_error_t getMmsRecvOpt(msg_struct_t msg_struct); + msg_error_t setMmsRecvOpt(msg_struct_t msg_struct); + msg_error_t getPushMsgOpt(msg_struct_t msg_struct); + msg_error_t setPushMsgOpt(msg_struct_t msg_struct); + msg_error_t getVoiceMsgOpt(msg_struct_t msg_struct); + msg_error_t setVoiceMsgOpt(msg_struct_t msg_struct); + msg_error_t getGeneralOpt(msg_struct_t msg_struct); + msg_error_t setGeneralOpt(msg_struct_t msg_struct); + msg_error_t getMsgSizeOpt(msg_struct_t msg_struct); + msg_error_t setMsgSizeOpt(msg_struct_t msg_struct); + + /*Backup & Restore */ + msg_error_t backupMessage(msg_message_backup_type_t type, const char *backup_filepath); + msg_error_t restoreMessage(const char *backup_filepath); + msg_error_t getVobject(msg_message_id_t MsgId, void** encodedData); + /* ETC */ + msg_error_t searchMessage(const char *pSearchString, msg_struct_list_s *pThreadViewList); + + + msg_error_t dbSelectWithQuery(const char *query, char ***db_res, int *row_count, int *col_count); + void dbFree(char **db_res); + + msg_error_t getRejectMsgList(const char *pNumber, msg_struct_list_s *pRejectMsgList); + msg_error_t regStorageChangeCallback(msg_storage_change_cb onStorageChange, void *pUserParam); + msg_error_t getReportStatus(msg_message_id_t msg_id, msg_struct_list_s *report_list); + msg_error_t getThreadIdByAddress(msg_struct_list_s *pAddrList, msg_thread_id_t *pThreadId); + msg_error_t getThreadIdByAddress(msg_list_handle_t msg_address_list, msg_thread_id_t *pThreadId); + msg_error_t getThread(msg_thread_id_t threadId, MSG_THREAD_VIEW_S* pThreadInfo); + msg_error_t getMessageList(const MSG_LIST_CONDITION_S *pListCond, msg_struct_list_s *pMsgList); + msg_error_t getMediaList(const msg_thread_id_t thread_id, msg_list_handle_t *pMediaList); + + /* Push Event */ + msg_error_t addPushEvent(MSG_PUSH_EVENT_INFO_S *push_event); + msg_error_t deletePushEvent(MSG_PUSH_EVENT_INFO_S *push_event); + msg_error_t updatePushEvent(MSG_PUSH_EVENT_INFO_S *pSrc, MSG_PUSH_EVENT_INFO_S *pDst); + + void convertMsgStruct(const MSG_MESSAGE_INFO_S *pSource, MSG_MESSAGE_HIDDEN_S *pDest); + void convertSendOptStruct(const MSG_SENDINGOPT_INFO_S* pSrc, MSG_SENDINGOPT_S* pDest, MSG_MESSAGE_TYPE_S msgType); + + void connectSocket(); + void disconnectSocket(); + +private: + void write(const char *pCmd, int CmdSize, char **ppEvent); + void read(char **ppEvent); + void generateConnectionId(char *ConnectionId); + void convertMsgStruct(const MSG_MESSAGE_HIDDEN_S *pSource, MSG_MESSAGE_INFO_S *pDest); + void convertSendOptStruct(const MSG_SENDINGOPT_S* pSrc, MSG_SENDINGOPT_INFO_S* pDest, MSG_MESSAGE_TYPE_S msgType); + int getSettingCmdSize(MSG_OPTION_TYPE_T optionType); + bool checkEventData(char *pEventData); + msg_error_t checkPermission(void); + + char mConnectionId[20]; + short mCounter; + + char mCookie[MAX_COOKIE_LEN]; + + MsgIpcClientSocket mClientSock; + MsgMutex mx; }; #endif /* MSG_HANDLE_H */ diff --git a/include/proxy/MsgProxyContact.h b/include/proxy/MsgProxyContact.h index 3d1d0be..abbd660 100644 --- a/include/proxy/MsgProxyContact.h +++ b/include/proxy/MsgProxyContact.h @@ -19,13 +19,13 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgInternalTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgOpenContactSvc(); msg_error_t MsgCloseContactSvc(); diff --git a/include/proxy/MsgProxyListener.h b/include/proxy/MsgProxyListener.h index f14a1f8..99f2141 100755 --- a/include/proxy/MsgProxyListener.h +++ b/include/proxy/MsgProxyListener.h @@ -19,7 +19,7 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgIpcSocket.h" #include "MsgTypes.h" @@ -32,7 +32,7 @@ /*================================================================================================== - VARIABLES + VARIABLES ==================================================================================================*/ typedef struct { MsgHandle* hAddr; @@ -131,7 +131,7 @@ typedef std::list<MSG_REPORT_INCOMING_CB_ITEM_S> MsgReportMessageCBList; typedef std::set<MsgHandle*> handle_set; /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgProxyListener { diff --git a/include/utils/MsgCallStatusManager.h b/include/utils/MsgCallStatusManager.h index 7743bbe..188cfa1 100644 --- a/include/utils/MsgCallStatusManager.h +++ b/include/utils/MsgCallStatusManager.h @@ -18,12 +18,12 @@ #define MSG_CALL_STATUS_MANAGER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <gio/gio.h> /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define CALL_MGR_BUS_NAME "org.tizen.callmgr" #define CALL_MGR_PATH_NAME "/org/tizen/callmgr" @@ -31,7 +31,7 @@ #define CALL_MGR_MEMBER_NAME "CallStatus" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ void MsgInitCallStatusManager(); void MsgDeInitCallStatusManager(); diff --git a/include/utils/MsgContact.h b/include/utils/MsgContact.h index 3337d31..343d49d 100755 --- a/include/utils/MsgContact.h +++ b/include/utils/MsgContact.h @@ -18,13 +18,13 @@ #define MSG_CONTACT_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgInternalTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ msg_error_t MsgGetContactInfo(const MSG_ADDRESS_INFO_S *pAddrInfo, MSG_CONTACT_INFO_S *pContactInfo); diff --git a/include/utils/MsgDebug.h b/include/utils/MsgDebug.h index d1fc5df..146ad39 100755 --- a/include/utils/MsgDebug.h +++ b/include/utils/MsgDebug.h @@ -18,7 +18,7 @@ #define __MSG_DEBUG_H__ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <sys/types.h> #include <unistd.h> @@ -30,7 +30,7 @@ #include "MsgCmdTypes.h" /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define USER_TAG "MSG_FW" #undef LOG_TAG @@ -126,7 +126,7 @@ if (expr) {\ MSG_ERR(fmt, ##__VA_ARGS__);\ return (val);\ - }\ + } \ } while (0) #define MSG_ERR_RET_M(expr, fmt, ...)\ @@ -134,14 +134,14 @@ if (expr) {\ MSG_ERR(fmt, ##__VA_ARGS__);\ return;\ - }\ + } \ } while (0) #define MSG_WARN_M(expr, fmt, ...)\ do { \ if (expr) {\ MSG_WARN(fmt, ##__VA_ARGS__);\ - }\ + } \ } while (0) /*profile log macros*/ @@ -159,7 +159,7 @@ gettimeofday(&__prf_2_##pfid, 0);\ long __ds = __prf_2_##pfid.tv_sec - __prf_1_##pfid.tv_sec;\ long __dm = __prf_2_##pfid.tv_usec - __prf_1_##pfid.tv_usec;\ - if ( __dm < 0 ) { __ds--; __dm = 1000000 + __dm; } \ + if (__dm < 0) { __ds--; __dm = 1000000 + __dm; } \ SLOGD("**PROFILE** [MSGFW: %s: %s() %u ~ %u] " #pfid " -> Elapsed Time: %u.%06u seconds\n", \ rindex(__FILE__, '/')+1, \ __FUNCTION__, \ @@ -185,14 +185,14 @@ int get_tid(); #define MSG_BEGIN() \ do { \ - printf("\n[%d] BEGIN >>>> %s() at [MSGFW: %s: %d]\n", get_tid(), __FUNCTION__, rindex(__FILE__, '/')+1, __LINE__);\ - } while (0) + printf("\n[%d] BEGIN >>>> %s() at [MSGFW: %s: %d]\n", get_tid(), __FUNCTION__, rindex(__FILE__, '/')+1, __LINE__);\ + } while (0) #define MSG_END() \ do { \ - printf("\n[%d] END <<<< %s() at [MSGFW: %s: %d]\n", get_tid(), __FUNCTION__, rindex(__FILE__, '/')+1, __LINE__); \ - } \ - while (0) + printf("\n[%d] END <<<< %s() at [MSGFW: %s: %d]\n", get_tid(), __FUNCTION__, rindex(__FILE__, '/')+1, __LINE__); \ + } \ + while (0) #define MSG_PROFILE_BEGIN(pfid) \ unsigned int __prf_l1_##pfid = __LINE__; \ @@ -208,7 +208,7 @@ int get_tid(); gettimeofday(&__prf_2_##pfid, 0);\ long __ds = __prf_2_##pfid.tv_sec - __prf_1_##pfid.tv_sec;\ long __dm = __prf_2_##pfid.tv_usec - __prf_1_##pfid.tv_usec;\ - if ( __dm < 0 ) { __ds--; __dm = 1000000 + __dm; } \ + if (__dm < 0) { __ds--; __dm = 1000000 + __dm; } \ printf("**PROFILE** [MSGFW: %s: %s() %u ~ %u] " #pfid \ " -> Elapsed Time: %u.%06u seconds\n", \ rindex(__FILE__, '/')+1, \ @@ -240,7 +240,7 @@ int get_tid(); gettimeofday(&__prf_2_##pfid, 0);\ long __ds = __prf_2_##pfid.tv_sec - __prf_1_##pfid.tv_sec;\ long __dm = __prf_2_##pfid.tv_usec - __prf_1_##pfid.tv_usec;\ - if ( __dm < 0 ) { __ds--; __dm = 1000000 + __dm; } \ + if (__dm < 0) { __ds--; __dm = 1000000 + __dm; } \ printf("**PROFILE** [MSGFW: %s: %s() %u ~ %u] " #pfid \ " -> Elapsed Time: %u.%06u seconds\n", \ rindex(__FILE__, '/')+1, \ @@ -258,12 +258,12 @@ int get_tid(); ({\ if (x != NULL) {\ free(x);\ - x = NULL;}\ + x = NULL; } \ }) /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ const char * MsgDbgCmdStr(MSG_CMD_TYPE_T cmdType); diff --git a/include/utils/MsgException.h b/include/utils/MsgException.h index 3d18c59..55874d0 100755 --- a/include/utils/MsgException.h +++ b/include/utils/MsgException.h @@ -18,7 +18,7 @@ #define MSG_EXCEPTION_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <stdexcept> #include <string> @@ -27,7 +27,7 @@ using namespace std; /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define THROW(errCode, debugFmt, ...) \ do {\ @@ -35,22 +35,21 @@ do {\ snprintf(__debugBuf, 256, debugFmt, ##__VA_ARGS__);\ MsgException e(errCode, __debugBuf);\ MSG_FATAL("%s [%d]", e.what(), e.errorCode());\ - throw e; \ + throw e; \ } while (0) /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ -class MsgException : public runtime_error /* public exception */ +class MsgException:public runtime_error /* public exception */ { public: - MsgException(int errCode, const string& msg = "") + MsgException(int errCode, const string &msg = "") : runtime_error(errorStrings[errCode] + " : " + msg), eCode(errCode) { } - enum - { + enum { SUCCESS = 0, INVALID_PARAM, diff --git a/include/utils/MsgGconfWrapper.h b/include/utils/MsgGconfWrapper.h index 95ebb79..6106973 100755 --- a/include/utils/MsgGconfWrapper.h +++ b/include/utils/MsgGconfWrapper.h @@ -19,7 +19,7 @@ /* #define USE_GCONF */ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgInternalTypes.h" @@ -31,34 +31,33 @@ #endif /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ #ifdef USE_GCONF -typedef struct _MSG_GOBJECT_CLIENT_S -{ +typedef struct _MSG_GOBJECT_CLIENT_S { GObject* object; -}MSG_GOBJECT_CLIENT_S; +} MSG_GOBJECT_CLIENT_S; #endif typedef void (*_vconf_change_cb)(keynode_t *key, void* data); /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ -msg_error_t MsgSettingSetString(const char *pKey, const char *pSetValue); -msg_error_t MsgSettingSetInt(const char *pKey, int nSetValue); -msg_error_t MsgSettingSetBool(const char *pKey, bool bSetValue); +msg_error_t MsgSettingSetString(const char *pKey, const char *pSetValue); +msg_error_t MsgSettingSetInt(const char *pKey, int nSetValue); +msg_error_t MsgSettingSetBool(const char *pKey, bool bSetValue); -msg_error_t MsgSettingGetString(const char *pKey, char **pVal); -msg_error_t MsgSettingGetInt(const char *pKey, int *pVal); -msg_error_t MsgSettingGetBool(const char *pKey, bool *pVal); +msg_error_t MsgSettingGetString(const char *pKey, char **pVal); +msg_error_t MsgSettingGetInt(const char *pKey, int *pVal); +msg_error_t MsgSettingGetBool(const char *pKey, bool *pVal); -msg_error_t MsgSettingHandleNewMsg(int SmsCnt, int MmsCnt); -msg_error_t MsgSettingSetIndicator(int SmsCnt, int MmsCnt); +msg_error_t MsgSettingHandleNewMsg(int SmsCnt, int MmsCnt); +msg_error_t MsgSettingSetIndicator(int SmsCnt, int MmsCnt); int MsgSettingGetAutoReject(); -bool MsgSettingGetUnknownAutoReject(); +bool MsgSettingGetUnknownAutoReject(); msg_error_t MsgSettingRegVconfCBCommon(const char *pKey, _vconf_change_cb pCb); msg_error_t MsgSettingRemoveVconfCBCommon(const char *pKey, _vconf_change_cb pCb); diff --git a/include/utils/MsgIpcSocket.h b/include/utils/MsgIpcSocket.h index 9cdecda..f230c08 100755 --- a/include/utils/MsgIpcSocket.h +++ b/include/utils/MsgIpcSocket.h @@ -18,7 +18,7 @@ #define __IPCSocket_H__ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <sys/types.h> #include <map> @@ -28,9 +28,9 @@ /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ -#define MSG_MAX_IPC_SIZE 50000 // 50 * 1000 = sizeof(msg common info) * max message count +#define MSG_MAX_IPC_SIZE 50000 /* 50 * 1000 = sizeof(msg common info) * max message count */ #define MAX_NUM_IPC_CLIENT 10 #define MSG_SOCKET_PATH "/tmp/.msgfw_socket" @@ -40,17 +40,16 @@ /*================================================================================================== - ENUM + ENUM ==================================================================================================*/ -typedef enum -{ +typedef enum { CLOSE_CONNECTION_BY_SIGNAL = 0, CLOSE_CONNECTION_BY_USER = -17, } IPC_CONTROL_E; /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgIpcClientSocket { @@ -58,18 +57,18 @@ public: MsgIpcClientSocket(); /* ~MsgIpcClientSocket(); */ - int maxFd() { return (maxfd+1); } - fd_set fdSet() { return fds; } - int fd() { return sockfd; } + int maxFd() { return (maxfd+1); } + fd_set fdSet() { return fds; } + int fd() { return sockfd; } msg_error_t connect(const char *path); msg_error_t close(); /* write msg to ipc server */ - int write(const char* buf, unsigned int len); + int write(const char* buf, unsigned int len); /* read msg from ipc server */ - int read(char** buf, unsigned int* len); - void addfd(int fd); - int getRemoteFd() {return remotefd; } + int read(char** buf, unsigned int* len); + void addfd(int fd); + int getRemoteFd() {return remotefd; } private: int readn(char *buf, unsigned int len); int writen(const char *buf, unsigned int len); @@ -85,20 +84,20 @@ class MsgIpcServerSocket public: MsgIpcServerSocket(); ~MsgIpcServerSocket() { mapFds.clear(); } - int maxFd() { return (maxfd+1); } - fd_set fdSet() { return fds; } - int fd() { return sockfd; } + int maxFd() { return (maxfd+1); } + fd_set fdSet() { return fds; } + int fd() { return sockfd; } msg_error_t open(const char *path); msg_error_t accept(); - void close(int fd); + void close(int fd); /* read msg from client of fd */ - int read(int fd, char** buf, int* len); + int read(int fd, char** buf, int* len); /* write msg to ipc client */ - int write(int fd, const char* buf, unsigned int len); - void addfd(int fd); - void setSockfd(int fd) { sockfd = fd; } + int write(int fd, const char* buf, unsigned int len); + void addfd(int fd); + void setSockfd(int fd) { sockfd = fd; } private: int readn(int fd, char *buf, unsigned int len); @@ -108,9 +107,9 @@ private: int sockfd; /* information about IPC clients, it is used for select() */ - fd_set fds; - int maxfd; - std::map<int, int> mapFds; + fd_set fds; + int maxfd; + std::map<int, int> mapFds; }; #endif /*__IPCSocket_H__ */ diff --git a/include/utils/MsgJsonParser.h b/include/utils/MsgJsonParser.h index 87034f6..1626800 100755 --- a/include/utils/MsgJsonParser.h +++ b/include/utils/MsgJsonParser.h @@ -21,8 +21,8 @@ #include "MsgDebug.h" typedef enum { - MSG_JSON_GEN_ARRAY, - MSG_JSON_GEN_OBJECT + MSG_JSON_GEN_ARRAY, + MSG_JSON_GEN_OBJECT } msg_json_gen_type; typedef struct msg_json_gen_object_t { @@ -73,7 +73,7 @@ char* msg_json_gen_make_json_msg(msg_json_gen_object *root_obj, unsigned long *l } #define MSG_PRINT_PARSER_OBJECT(index, obj) {\ - switch(obj.type) {\ + switch (obj.type) {\ case MSG_JSON_PARSER_NULL:\ MSG_DEBUG("parse obj : idx = %d, key =[%s], type = [%d], value = [%p], value num = [%f]", index, obj.key, obj.type, obj.value, obj.number_value);\ break;\ @@ -101,42 +101,42 @@ char* msg_json_gen_make_json_msg(msg_json_gen_object *root_obj, unsigned long *l default:\ MSG_DEBUG("parse obj : idx = %d, key =[%s], type = [%d], value = [%p], value num = [%f]", index, obj.key, obj.type, obj.value, obj.number_value);\ break;\ - }\ + } \ } /** *@enum msg_json_parser_value_type * This enumerates json-node types. */ typedef enum { - MSG_JSON_PARSER_NULL = 0, /** 0 <null value */ - MSG_JSON_PARSER_INT, /** 1 < signed integer value */ - MSG_JSON_PARSER_UINT, /** 2 < unsigned integer value */ - MSG_JSON_PARSER_REAL, /** 3 < double value */ - MSG_JSON_PARSER_STRING, /** 4 < UTF-8 string value */ - MSG_JSON_PARSER_BOOLEAN, /** 5 < bool value */ - MSG_JSON_PARSER_ARRAY, /** 6 < array value (ordered list) */ - MSG_JSON_PARSER_OBJECT, /** 7 < object value */ + MSG_JSON_PARSER_NULL = 0, /** 0 <null value */ + MSG_JSON_PARSER_INT, /** 1 < signed integer value */ + MSG_JSON_PARSER_UINT, /** 2 < unsigned integer value */ + MSG_JSON_PARSER_REAL, /** 3 < double value */ + MSG_JSON_PARSER_STRING, /** 4 < UTF-8 string value */ + MSG_JSON_PARSER_BOOLEAN, /** 5 < bool value */ + MSG_JSON_PARSER_ARRAY, /** 6 < array value (ordered list) */ + MSG_JSON_PARSER_OBJECT, /** 7 < object value */ } msg_json_parser_value_type; typedef void *msg_json_parser_handle; typedef struct msg_json_parser_object_t { - msg_json_parser_value_type type; - char *key; - void *value; /** Value of the node. VALID - only if type is - MSG_JSON_PARSER_NULL, - MSG_JSON_PARSER_STRING, - MSG_JSON_PARSER_ARRAY, - MSG_JSON_PARSER_OBJECT */ - double float_value; /** Value of the node. VALID - only if type is - MSG_JSON_PARSER_REAL */ - long long int number_value; /** Value of the node. VALID - only if type is - MSG_JSON_PARSER_UINT, - MSG_JSON_PARSER_INT, - MSG_JSON_PARSER_BOOLEAN */ + msg_json_parser_value_type type; + char *key; + void *value; /** Value of the node. VALID + only if type is + MSG_JSON_PARSER_NULL, + MSG_JSON_PARSER_STRING, + MSG_JSON_PARSER_ARRAY, + MSG_JSON_PARSER_OBJECT */ + double float_value; /** Value of the node. VALID + only if type is + MSG_JSON_PARSER_REAL */ + long long int number_value; /** Value of the node. VALID + only if type is + MSG_JSON_PARSER_UINT, + MSG_JSON_PARSER_INT, + MSG_JSON_PARSER_BOOLEAN */ } msg_json_parser_object; msg_json_parser_handle msg_json_parser_handle_create(void); diff --git a/include/utils/MsgMemory.h b/include/utils/MsgMemory.h index 2be5f89..43082b4 100755 --- a/include/utils/MsgMemory.h +++ b/include/utils/MsgMemory.h @@ -19,7 +19,7 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <stdio.h> #include <string.h> @@ -27,18 +27,18 @@ /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ -#define GETSP() ({ unsigned int sp; asm volatile ("mov %0,sp " : "=r"(sp) ); sp;}) +#define GETSP() ({ unsigned int sp; asm volatile ("mov %0,sp " : "=r"(sp)); sp; }) #define BUF_SIZE 256 -#define PAGE_SIZE (1 << 12) -#define _ALIGN_UP(addr, size) (((addr)+((size)-1))&(~((size)-1))) -#define _ALIGN_DOWN(addr, size) ((addr)&(~((size)-1))) -#define PAGE_ALIGN(addr) _ALIGN_DOWN(addr, PAGE_SIZE) +#define PAGE_SIZE (1 << 12) +#define _ALIGN_UP(addr, size) (((addr)+((size)-1))&(~((size)-1))) +#define _ALIGN_DOWN(addr, size) ((addr)&(~((size)-1))) +#define PAGE_ALIGN(addr) _ALIGN_DOWN(addr, PAGE_SIZE) /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ static inline void stack_trim(void) @@ -61,9 +61,9 @@ stack_trim(void) } fclose(file); - if(found) { + if (found) { sscanf(buf, "%x-", &stacktop); - if(madvise((void*)PAGE_ALIGN(stacktop), PAGE_ALIGN(sp)-stacktop, MADV_DONTNEED) < 0) + if (madvise((void*)PAGE_ALIGN(stacktop), PAGE_ALIGN(sp)-stacktop, MADV_DONTNEED) < 0) perror("stack madvise fail"); } } diff --git a/include/utils/MsgMmsMessage.h b/include/utils/MsgMmsMessage.h index 805b096..b3d8e67 100755 --- a/include/utils/MsgMmsMessage.h +++ b/include/utils/MsgMmsMessage.h @@ -18,7 +18,7 @@ #define MSG_MMS_MESSAGE_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" #include "MsgInternalTypes.h" diff --git a/include/utils/MsgMutex.h b/include/utils/MsgMutex.h index 89e3c56..39d7525 100755 --- a/include/utils/MsgMutex.h +++ b/include/utils/MsgMutex.h @@ -18,7 +18,7 @@ #define __MSG_MUTEX_H__ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <iostream> #include <pthread.h> @@ -43,7 +43,8 @@ public: ~MsgMutex() { pthread_mutex_destroy(&m); } void lock() { pthread_mutex_lock(&m); } - int timedlock() { + int timedlock() + { struct timespec abs_time; clock_gettime(CLOCK_REALTIME, &abs_time); abs_time.tv_sec += 1; @@ -60,7 +61,7 @@ private: class MsgMutexLocker { public: - MsgMutexLocker(MsgMutex& mx) { + MsgMutexLocker(MsgMutex &mx) { pm = &mx; pm->lock(); } @@ -79,7 +80,8 @@ public: MsgCndVar() { pthread_cond_init(&c, 0); } ~MsgCndVar() { pthread_cond_destroy(&c); } void wait(pthread_mutex_t* m) { pthread_cond_wait(&c, m); } - int timedwait(pthread_mutex_t* m, int sec) { + int timedwait(pthread_mutex_t* m, int sec) + { struct timeval now = {0}; struct timespec timeout = {0}; gettimeofday(&now, NULL); diff --git a/include/utils/MsgSqliteWrapper.h b/include/utils/MsgSqliteWrapper.h index 27a05f2..3fd3dbc 100755 --- a/include/utils/MsgSqliteWrapper.h +++ b/include/utils/MsgSqliteWrapper.h @@ -18,20 +18,20 @@ #define MSG_SQLITE_WRAPPER_H /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" #include "MsgMutex.h" #include <sqlite3.h> /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ -#define MSGFW_DB_NAME TZ_SYS_DB_PATH"/.msg_service.db" +#define MSGFW_DB_NAME TZ_SYS_DB_PATH"/.msg_service.db" #define MSGFW_MESSAGE_TABLE_NAME "MSG_MESSAGE_TABLE" #define MSGFW_FOLDER_TABLE_NAME "MSG_FOLDER_TABLE" -#define MSGFW_ADDRESS_TABLE_NAME "MSG_ADDRESS_TABLE" +#define MSGFW_ADDRESS_TABLE_NAME "MSG_ADDRESS_TABLE" #define MSGFW_CONVERSATION_TABLE_NAME "MSG_CONVERSATION_TABLE" #define MSGFW_SIM_MSG_TABLE_NAME "MSG_SIM_TABLE" #define MSGFW_FILTER_TABLE_NAME "MSG_FILTER_TABLE" @@ -70,17 +70,17 @@ #define MSGFW_DB_ESCAPE_CHAR '\\' -#define SHM_FILE_FOR_DB_LOCK "/.msg_shm_db_lock" +#define SHM_FILE_FOR_DB_LOCK "/.msg_shm_db_lock" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ void MsgReleaseMemoryDB(); msg_error_t MsgConvertStrWithEscape(const char *input, char **output); /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgDbHandler { diff --git a/include/utils/MsgTextConvert.h b/include/utils/MsgTextConvert.h index c9b6087..e67d9a8 100755 --- a/include/utils/MsgTextConvert.h +++ b/include/utils/MsgTextConvert.h @@ -19,13 +19,13 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include <map> /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define IN #define OUT @@ -41,10 +41,9 @@ typedef unsigned char MSG_LANGUAGE_ID_T; /*================================================================================================== - ENUMS + ENUMS ==================================================================================================*/ -enum _MSG_CHAR_TYPE_E -{ +enum _MSG_CHAR_TYPE_E { MSG_CHAR_DEFAULT = 0, MSG_CHAR_GSM7EXT, MSG_CHAR_TURKISH, @@ -52,8 +51,7 @@ enum _MSG_CHAR_TYPE_E MSG_CHAR_PORTUGUESE }; -enum _MSG_LANGUAGE_ID_E -{ +enum _MSG_LANGUAGE_ID_E { MSG_LANG_ID_RESERVED = 0, MSG_LANG_ID_TURKISH, MSG_LANG_ID_SPANISH, @@ -71,11 +69,10 @@ enum _MSG_LANGUAGE_ID_E }; /*================================================================================================== - STRUCTURES + STRUCTURES ==================================================================================================*/ -typedef struct _MSG_LANG_INFO_S -{ +typedef struct _MSG_LANG_INFO_S { bool bSingleShift; bool bLockingShift; @@ -84,25 +81,22 @@ typedef struct _MSG_LANG_INFO_S } MSG_LANG_INFO_S; -typedef struct _MSG_SINGLE_SHIFT_S -{ +typedef struct _MSG_SINGLE_SHIFT_S { MSG_LANGUAGE_ID_T langId; } MSG_SINGLE_SHIFT_S; -typedef struct _MSG_LOCKING_SHIFT_S -{ +typedef struct _MSG_LOCKING_SHIFT_S { MSG_LANGUAGE_ID_T langId; } MSG_LOCKING_SHIFT_S; /* ETSI GSM 03.38 GSM 7 bit Default Alphabet Table -> UCS2 */ -static const WCHAR g_GSM7BitToUCS2[] = -{ +static const WCHAR g_GSM7BitToUCS2[] = { /* @ */ 0x0040, 0x00A3, 0x0024, 0x00A5, 0x00E8, 0x00E9, 0x00F9, 0x00EC, 0x00F2, 0x00C7, 0x000A, 0x00D8, 0x00F8, 0x000D, 0x00C5, 0x00E5, /* ��*/ - 0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, 0x03A3, 0x0398, 0x039E, 0x001B, 0x00C6, 0x00E6, 0x00DF, 0x00C9, + 0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, 0x03A3, 0x0398, 0x039E, 0x001B, 0x00C6, 0x00E6, 0x00DF, 0x00C9, /* SP */ 0x0020, 0x0021, 0x0022, 0x0023, 0x00A4, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, /* 0 */ @@ -119,54 +113,53 @@ static const WCHAR g_GSM7BitToUCS2[] = /* GSM 7 bit Default Alphabet Extension Table -> UCS2 */ -static const WCHAR g_GSM7BitExtToUCS2[] = -{ +static const WCHAR g_GSM7BitExtToUCS2[] = { /* 0x0020 -> (SP) for invalid code */ - /* Page Break */ + /* Page Break */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x000C, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - /* ^ */ + /* ^ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x005E, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x001B, 0x0020, 0x0020, 0x0020, 0x0020, - /* { */ /* } */ /* \ */ + /* { */ /* } */ + /* \ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x007B, 0x007D, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005C, - /* [ */ /* ~ */ /* ] */ + /* [ */ /* ~ */ /* ] */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005B, 0x007E, 0x005D, 0x0020, /* | */ 0x007C, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - /* ��*/ + /* ��*/ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x20AC, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; /* Turkish National Language Single Shift Table -> UCS2 */ -static const WCHAR g_TurkishSingleToUCS2[] = -{ +static const WCHAR g_TurkishSingleToUCS2[] = { /* 0x0020 -> (SP) for invalid code */ - /* Page Break */ + /* Page Break */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x000C, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - /* ^ */ + /* ^ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x005E, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x001B, 0x0020, 0x0020, 0x0020, 0x0020, - /* { */ /* } */ /* \ */ + /* { */ /* } */ + /* \ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x007B, 0x007D, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005C, - /* [ */ /* ~ */ /* ] */ + /* [ */ /* ~ */ /* ] */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005B, 0x007E, 0x005D, 0x0020, /* | */ 0x007C, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x011E, 0x0020, 0x0130, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x015E, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - /* ��*/ + /* ��*/ 0x0020, 0x0020, 0x0020, 0x00E7, 0x0020, 0x20AC, 0x0020, 0x011F, 0x0020, 0x0131, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x015F, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; /* Turkish National Language Locking Shift Table -> UCS2 */ -static const WCHAR g_TurkishLockingToUCS2[] = -{ +static const WCHAR g_TurkishLockingToUCS2[] = { /* @ */ 0x0040, 0x00A3, 0x0024, 0x00A5, 0x20AC, 0x00E9, 0x00F9, 0x00EC, 0x00F2, 0x00C7, 0x000A, 0x011E, 0x011F, 0x000D, 0x00C5, 0x00E5, /* ��*/ - 0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, 0x03A3, 0x0398, 0x039E, 0x001B, 0x015E, 0x015F, 0x00DF, 0x00C9, + 0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, 0x03A3, 0x0398, 0x039E, 0x001B, 0x015E, 0x015F, 0x00DF, 0x00C9, /* SP */ 0x0020, 0x0021, 0x0022, 0x0023, 0x00A4, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, /* 0 */ @@ -183,54 +176,53 @@ static const WCHAR g_TurkishLockingToUCS2[] = /* Spanish National Language Single Shift Table -> UCS2 */ -static const WCHAR g_SpanishSingleToUCS2[] = -{ +static const WCHAR g_SpanishSingleToUCS2[] = { /* 0x0020 -> (SP) for invalid code */ - /* Page Break */ + /* Page Break */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00E7, 0x000C, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - /* ^ */ + /* ^ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x005E, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x001B, 0x0020, 0x0020, 0x0020, 0x0020, - /* { */ /* } */ /* \ */ + /* { */ /* } */ + /* \ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x007B, 0x007D, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005C, - /* [ */ /* ~ */ /* ] */ + /* [ */ /* ~ */ /* ] */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005B, 0x007E, 0x005D, 0x0020, /* | */ 0x007C, 0x00C1, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00CD, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00D3, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00DA, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - /* ��*/ + /* ��*/ 0x0020, 0x00E1, 0x0020, 0x0020, 0x0020, 0x20AC, 0x0020, 0x0020, 0x0020, 0x00ED, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00F3, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00FA, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; /* Portuguese National Language Single Shift Table -> UCS2 */ -static const WCHAR g_PortuSingleToUCS2[] = -{ +static const WCHAR g_PortuSingleToUCS2[] = { /* 0x0020 -> (SP) for invalid code */ - /* Page Break */ + /* Page Break */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00EA, 0x0020, 0x0020, 0x0020, 0x00E7, 0x000C, 0x00D4, 0x00F4, 0x0020, 0x00C1, 0x00E1, - /* ^ */ + /* ^ */ 0x0020, 0x0020, 0x03A6, 0x0393, 0x005E, 0x03A9, 0x03A0, 0x03A8, 0x03A3, 0x0398, 0x0020, 0x001B, 0x0020, 0x0020, 0x0020, 0x00CA, - /* { */ /* } */ /* \ */ + /* { */ /* } */ + /* \ */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x007B, 0x007D, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005C, - /* [ */ /* ~ */ /* ] */ + /* [ */ /* ~ */ /* ] */ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x005B, 0x007E, 0x005D, 0x0020, /* | */ 0x007C, 0x00C0, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00CD, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00D3, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00DA, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00C3, 0x00D5, 0x0020, 0x0020, 0x0020, - /* ��*/ + /* ��*/ 0x0020, 0x00C2, 0x0020, 0x0020, 0x0020, 0x20AC, 0x0020, 0x0020, 0x0020, 0x00ED, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00F3, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00FA, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x00E3, 0x00F5, 0x0020, 0x0020, 0x00E2 }; /* Portuguese National Language Locking Shift Table -> UCS2 */ -static const WCHAR g_PortuLockingToUCS2[] = -{ +static const WCHAR g_PortuLockingToUCS2[] = { /* @ */ 0x0040, 0x00A3, 0x0024, 0x00A5, 0x00EA, 0x00E9, 0x00FA, 0x00ED, 0x00F3, 0x00E7, 0x000A, 0x00D4, 0x00F4, 0x000D, 0x00C1, 0x00E1, /* ��*/ - 0x0394, 0x005F, 0x0020, 0x00C7, 0x00C0, 0x0020, 0x005E, 0x005C, 0x20AC, 0x00D3, 0x007C, 0x001B, 0x00C2, 0x00E2, 0x00CA, 0x00C9, + 0x0394, 0x005F, 0x0020, 0x00C7, 0x00C0, 0x0020, 0x005E, 0x005C, 0x20AC, 0x00D3, 0x007C, 0x001B, 0x00C2, 0x00E2, 0x00CA, 0x00C9, /* SP */ 0x0020, 0x0021, 0x0022, 0x0023, 0x00A4, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, /* 0 */ @@ -247,7 +239,7 @@ static const WCHAR g_PortuLockingToUCS2[] = /*================================================================================================== - CLASS DEFINITIONS + CLASS DEFINITIONS ==================================================================================================*/ class MsgTextConvert { diff --git a/include/utils/MsgUtilFile.h b/include/utils/MsgUtilFile.h index 691546b..dcca088 100755 --- a/include/utils/MsgUtilFile.h +++ b/include/utils/MsgUtilFile.h @@ -19,12 +19,12 @@ #include <stdio.h> /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define FM_READ_WRITE_BUFFER_MAX (1024*1024*3) /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ bool MakeThumbnail(char *srcPath, char *dstPath); /** file operation wrapper - for avoding runtime error */ diff --git a/include/utils/MsgUtilFunction.h b/include/utils/MsgUtilFunction.h index 1442320..f021ced 100755 --- a/include/utils/MsgUtilFunction.h +++ b/include/utils/MsgUtilFunction.h @@ -20,7 +20,7 @@ #define MSG_UTIL_CH_EMAIL_AT '@' /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgSettingTypes.h" @@ -31,18 +31,18 @@ #include <bundle.h> /*================================================================================================== - DEFINES + DEFINES ==================================================================================================*/ #define MSG_TYPE_CHECK(a, b) \ do {\ - if(a != (b & 0xff00)) {\ + if (a != (b & 0xff00)) {\ return MSG_ERR_INVALID_PARAMETER; \ } \ - }while(0) + } while (0) /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ bool MsgCheckFeatureSupport(const char *feature_name); diff --git a/include/utils/MsgUtilStorage.h b/include/utils/MsgUtilStorage.h index ffa2f8a..445157e 100755 --- a/include/utils/MsgUtilStorage.h +++ b/include/utils/MsgUtilStorage.h @@ -19,7 +19,7 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgInternalTypes.h" #include "MsgStorageTypes.h" @@ -27,7 +27,7 @@ #include "MsgSettingTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ /* Common Function */ unsigned int MsgStoAddMessageTable(MsgDbHandler *pDbHandle, const MSG_MESSAGE_INFO_S *pMsgInfo); diff --git a/include/utils/MsgVMessage.h b/include/utils/MsgVMessage.h index 92903c8..32f9356 100755 --- a/include/utils/MsgVMessage.h +++ b/include/utils/MsgVMessage.h @@ -19,14 +19,14 @@ /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgInternalTypes.h" #include "MsgUtilStorage.h" /*================================================================================================== - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ==================================================================================================*/ char* MsgVMessageEncode(MSG_MESSAGE_INFO_S *pMsg); char *MsgVMessageEncodeSMS(MSG_MESSAGE_INFO_S *pMsg); |