apply tizen c coding rulesubmit/tizen/20160617.020945 accepted/tizen/wearable/20160617.084129 accepted/tizen/mobile/20160617.084106 accepted/tizen/ivi/20160617.084109 accepted/tizen/common/20160617.121645

Change-Id: If09083adc58f2bda06aa6e9ed745f1c9594f1cd3 Signed-off-by: hyungkang heo <hhk86.heo@samsung.com>
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 /plugin
parent: 700dd2ec843a593833031fcd9403492feee76271 (diff)
download: msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.tar.gz
msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.tar.bz2
msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.zip
48 files changed, 421 insertions, 424 deletions
diff --git a/plugin/mms_plugin/MmsPluginDecode.cpp b/plugin/mms_plugin/MmsPluginDecode.cpp
index db8eccb..0bf2923 100755
--- a/plugin/mms_plugin/MmsPluginDecode.cpp
+++ b/plugin/mms_plugin/MmsPluginDecode.cpp
@@ -1401,9 +1401,9 @@ __CATCH:
 /**
  * Decode Encoded Content type
  *
- * @param 	pEncodedData	[in] ContentType encoded data
+ * @param	pEncodedData	[in] ContentType encoded data
  * @param	pMsgType		[out] Decoded MsgType
- * @return 	Decoded address list
+ * @return	Decoded address list
  */
 static int __MmsBinaryDecodeContentType(FILE *pFile, MsgType *pMsgType, int totalLength)
 {
@@ -2467,7 +2467,7 @@ __CATCH:
 /**
  * Decode uintvar to 32bit unsigned integer
  *
- * @param 	pEncodedData    [in] encoded data
+ * @param	pEncodedData    [in] encoded data
  * @param	pUintVar		[out] Decode uintvar (32bit unsigned integer)
  * @return	The length of uintvar (-1, if cannot be converted to a uintvar)
  *
@@ -2528,9 +2528,9 @@ __CATCH:
 /**
  * Decode uintvar to 32bit unsigned integer by uintvar length
  *
- * @param 	pEncodedData [in] uintvar encoded data
- * @param 	length		 [in] length of integer value
- * @return 	unsigned integer value
+ * @param	pEncodedData [in] uintvar encoded data
+ * @param	length		 [in] length of integer value
+ * @return	unsigned integer value
  */
 static UINT32 __MmsHeaderDecodeIntegerByLength(FILE *pFile, UINT32 length, int totalLength)
 {
@@ -2600,9 +2600,9 @@ __CATCH:
 /**
  * Decode uintvar to 32bit unsigned integer by uintvar length
  *
- * @param 	pEncodedData	[in]  uintvar encoded data
+ * @param	pEncodedData	[in]  uintvar encoded data
  * @param	pInteger		[out] Decode integer value (long/short)
- * @return 	unsigned integer value (-1, if cannot be converted to unsigned integer value)
+ * @return	unsigned integer value (-1, if cannot be converted to unsigned integer value)
  */
 static bool __MmsBinaryDecodeInteger(FILE *pFile, UINT32 *pInteger, int *pIntLen, int totalLength)
 {
@@ -2684,7 +2684,7 @@ __CATCH:
 /**
  * Decode uintvar to 32bit unsigned integer by uintvar length
  *
- * @return 	1  : Success
+ * @return	1  : Success
  *			0  : This is not Value Length type data
  *			-1 : Requires System error report
  */
@@ -2740,7 +2740,7 @@ __CATCH:
 /**
  * Decode uintvar to 32bit unsigned integer by uintvar length
  *
- * @return 	1  : Success
+ * @return	1  : Success
  *			0  : This is not Value Length type data
  *			-1 : Requires System error report
  * @ defference : if there is not length-quote, consider it as short length.
@@ -2797,10 +2797,10 @@ __CATCH:
 /**
  * Decode QuotedString
  *
- * @param 	pEncodedData	[in] QuotedString encoded data
+ * @param	pEncodedData	[in] QuotedString encoded data
  * @param	szBuff			[out] Decoded quoted string
  * @param	bufLen			[out] Buffer length
- * @return 	length of quoted string
+ * @return	length of quoted string
  */
 static int __MmsBinaryDecodeQuotedString(FILE *pFile, char *szBuff, int bufLen, int totalLength)
 {
@@ -2821,7 +2821,7 @@ static int __MmsBinaryDecodeQuotedString(FILE *pFile, char *szBuff, int bufLen,
 	memset(szBuff, 0, bufLen);
 
 	if (__MsgLoadDataToDecodeBuffer(pFile, &gpCurMmsDecodeBuff, &gCurMmsDecodeBuffPos, &gMmsDecodeCurOffset,
-						  			 gpMmsDecodeBuf1, gpMmsDecodeBuf2, gMmsDecodeMaxLen, &gMmsDecodeBufLen, totalLength) == false) {
+									 gpMmsDecodeBuf1, gpMmsDecodeBuf2, gMmsDecodeMaxLen, &gMmsDecodeBufLen, totalLength) == false) {
 		MSG_DEBUG("fail to load to buffer");
 		goto __CATCH;
 	}
@@ -2879,7 +2879,7 @@ static int __MmsBinaryDecodeQuotedString(FILE *pFile, char *szBuff, int bufLen,
 		}
 
 		if (__MsgLoadDataToDecodeBuffer(pFile, &gpCurMmsDecodeBuff, &gCurMmsDecodeBuffPos, &gMmsDecodeCurOffset,
-							 			gpMmsDecodeBuf1, gpMmsDecodeBuf2, gMmsDecodeMaxLen, &gMmsDecodeBufLen, totalLength) == false) {
+										gpMmsDecodeBuf1, gpMmsDecodeBuf2, gMmsDecodeMaxLen, &gMmsDecodeBufLen, totalLength) == false) {
 			MSG_DEBUG("fail to load to buffer");
 			goto __CATCH;
 		}
@@ -2936,10 +2936,10 @@ __CATCH:
 /**
  * Decode Text
  *
- * @param 	pEncodedData	[in] QuotedString encoded data
+ * @param	pEncodedData	[in] QuotedString encoded data
  * @param	szBuff			[out] Decoded quoted string
  * @param	bufLen			[out] Buffer length
- * @return 	length of decode text string
+ * @return	length of decode text string
  */
 static int __MmsBinaryDecodeText(FILE *pFile, char *szBuff, int bufLen, int totalLength)
 {
@@ -2967,7 +2967,7 @@ static int __MmsBinaryDecodeText(FILE *pFile, char *szBuff, int bufLen, int tota
 	memset(szBuff, 0, bufLen);
 
 	if (__MsgLoadDataToDecodeBuffer(pFile, &gpCurMmsDecodeBuff, &gCurMmsDecodeBuffPos, &gMmsDecodeCurOffset,
-						  			gpMmsDecodeBuf1, gpMmsDecodeBuf2, gMmsDecodeMaxLen, &gMmsDecodeBufLen, totalLength) == false) {
+									gpMmsDecodeBuf1, gpMmsDecodeBuf2, gMmsDecodeMaxLen, &gMmsDecodeBufLen, totalLength) == false) {
 		MSG_DEBUG("fail to load to buffer");
 		goto __CATCH;
 	}
@@ -3271,9 +3271,9 @@ __CATCH:
 /**
  * Decode Charset
  *
- * @param 	pEncodedData	[in] QuotedString encoded data
+ * @param	pEncodedData	[in] QuotedString encoded data
  * @param	nCharSet		[out] Decoded character set
- * @return 	length of charset value
+ * @return	length of charset value
  */
 static bool __MmsBinaryDecodeCharset(FILE *pFile, UINT32 *nCharSet, int *pCharSetLen, int totalLength)
 {
@@ -3318,10 +3318,10 @@ __CATCH:
 /**
  * Decode EncodedString
  *
- * @param 	pEncodedData	[in] QuotedString encoded data
+ * @param	pEncodedData	[in] QuotedString encoded data
  * @param	szBuff			[out] Decoded string buffer
  * @param	bufLen			[in]  Decoded buffer length
- * @return 	length of decoded string length
+ * @return	length of decoded string length
  */
 static bool __MmsBinaryDecodeEncodedString(FILE *pFile, char *szBuff, int bufLen, int totalLength)
 {
@@ -3443,9 +3443,9 @@ __CATCH:
 /**
  * Decode Encoded Addresses
  *
- * @param 	pEncodedData	[in] QuotedString encoded data
+ * @param	pEncodedData	[in] QuotedString encoded data
  * @param	pAddrLength		[out] Decoded address length
- * @return 	Decoded address list
+ * @return	Decoded address list
  */
 MsgHeaderAddress *__MmsDecodeEncodedAddress(FILE *pFile, int totalLength)
 {
@@ -3539,9 +3539,9 @@ __CATCH:
 /**
  * Decode Encoded Pointer String
  *
- * @param 	pEncodedData	[in] Long integer encoded data
+ * @param	pEncodedData	[in] Long integer encoded data
  * @param	pLongInteger	[out] Decoded long integer
- * @return 	Decoded address list
+ * @return	Decoded address list
  */
 static bool __MmsDecodeLongInteger(FILE *pFile, UINT32 *pLongInteger, int totalLength)
 {
@@ -3813,7 +3813,7 @@ bool MmsReadMsgBody(msg_message_id_t msgID, bool bSavePartsAsTempFiles, bool bRe
 			pMsg->nPartCount++;
 	}
 
-	/* 	make temporary	*/
+	/*	make temporary	*/
 	snprintf(szTempMediaDir, MSG_FILEPATH_LEN_MAX, "%s%s.dir", MSG_DATA_PATH, pMsg->szFileName);
 
 	if (MsgIsMultipart(pMsg->msgType.type) == true) {
@@ -6120,7 +6120,7 @@ void MmsPluginDecoder::decodeMmsPdu(MmsMsg *pMsg, msg_message_id_t msgID, const
 			pMsg->nPartCount++;
 	}
 
-	/* 	make temporary	*/
+	/*	make temporary	*/
 	snprintf(szTempMediaDir, MSG_FILEPATH_LEN_MAX, "%s%s.dir", MSG_DATA_PATH, pMsg->szFileName);
 
 	if (MsgIsMultipart(pMsg->msgType.type) == true) {
diff --git a/plugin/mms_plugin/MmsPluginEncode.cpp b/plugin/mms_plugin/MmsPluginEncode.cpp
index 1853955..1b535d6 100755
--- a/plugin/mms_plugin/MmsPluginEncode.cpp
+++ b/plugin/mms_plugin/MmsPluginEncode.cpp
@@ -187,10 +187,10 @@ static void __MmsUnregisterEncodeBuffer2(void)
 }
 
 /**
- * @param 	source [in] originam string
+ * @param	source [in] originam string
  * @param	length [in] gotten from MmsBinaryEncodeTextStringLen()
  * @param	dest [in] buffer to store quted string
- * @return 	changed string length
+ * @return	changed string length
 */
 static bool __MmsBinaryEncodeTextString2(FILE *pFile, UINT8 *source, int length)
 {
@@ -1899,7 +1899,7 @@ static bool __MmsBinaryEncodeMsgPart(FILE *pFile, int contentType, MsgType *pTyp
 		}
 
 		if (MsgWriteDataFromEncodeBuffer(pFile, gpMmsEncodeBuf, &gCurMmsEncodeBuffPos,
-							 				gMmsEncodeMaxLen, &gMmsEncodeCurOffset) == false) {
+											gMmsEncodeMaxLen, &gMmsEncodeCurOffset) == false) {
 			MSG_DEBUG("2. header MsgWriteDataFromEncodeBuffer fail");
 			goto __CATCH;
 		}
@@ -2300,7 +2300,7 @@ static int __MmsBinaryEncodeIntegerLen(UINT32 integer)
 /*
  * This makes value-length by specified integer value
  *
- * @param 	length [in] gotten from MmsBinaryEncodeIntegerLen()
+ * @param	length [in] gotten from MmsBinaryEncodeIntegerLen()
  */
 static bool __MmsBinaryEncodeInteger(FILE *pFile, UINT32 integer, int length)
 {
@@ -2374,7 +2374,7 @@ static int __MmsBinaryEncodeLongIntegerLen(UINT32 integer)
 /*
  * This makes value-length by specified integer value
  *
- * @param 	length [in] gotten from MmsBinaryEncodeIntegerLen()
+ * @param	length [in] gotten from MmsBinaryEncodeIntegerLen()
  */
 static bool __MmsBinaryEncodeLongInteger(FILE *pFile, UINT32 integer, int length)
 {
@@ -2439,10 +2439,10 @@ static int __MmsBinaryEncodeTextStringLen(UINT8 *source)
 }
 
 /*
- * @param 	source [in] originam string
+ * @param	source [in] originam string
  * @param	length [in] gotten from MmsBinaryEncodeTextStringLen()
  * @param	dest [in] buffer to store quted string
- * @return 	changed string length
+ * @return	changed string length
 */
 static bool __MmsBinaryEncodeTextString(FILE *pFile, UINT8 *source, int length)
 {
@@ -2486,8 +2486,8 @@ __CATCH:
 /*
  * Encode 28bit unsigned integer(Maximum) to uintvar
  *
- * @param 	interger [in] integer to be encoded
- * @return 	encoded UINTVAR stream
+ * @param	interger [in] integer to be encoded
+ * @return	encoded UINTVAR stream
 */
 const UINT32 UINTVAR_LENGTH_1 =  0x0000007f;		/* 7bit */
 const UINT32 UINTVAR_LENGTH_2 =  0x00003fff;		/* 14bit */
@@ -2585,8 +2585,8 @@ static int __MmsBinaryEncodeValueLengthLen(UINT32 integer)
 /*
  * This makes value-length by specified integer value
  *
- * @param 	length [in] from MmsBinaryEncodeValueLengthLen()
- * @return 	encoded value-length
+ * @param	length [in] from MmsBinaryEncodeValueLengthLen()
+ * @return	encoded value-length
  */
 static bool __MmsBinaryEncodeValueLength(FILE *pFile, UINT32 integer, int length)
 {
@@ -2644,10 +2644,10 @@ __CATCH:
  * make quoted string
  * Quoted-string = <Octet 34> *TEXT End-of-string
  *
- * @param 	source [in] original string
+ * @param	source [in] original string
  * @param	length [in] length (in bytes) of data
  * @param	dest [out] buffer to store quted string
- * @return 	changed string length
+ * @return	changed string length
 */
 static bool __MmsBinaryEncodeQuotedString(FILE *pFile, UINT8 *source, int length)
 {
@@ -2711,8 +2711,8 @@ __CATCH:
 /*
  * This makes value-length by specified integer value
  *
- * @param 	length [in] from MmsBinaryEncodeEncodedStringLen()
- * @return 	encoded encoded-string
+ * @param	length [in] from MmsBinaryEncodeEncodedStringLen()
+ * @return	encoded encoded-string
  */
 static bool __MmsBinaryEncodeEncodedString(FILE *pFile, UINT8 *source, int length)
 {
diff --git a/plugin/mms_plugin/MmsPluginHttp.cpp b/plugin/mms_plugin/MmsPluginHttp.cpp
index b785403..66d85e1 100755
--- a/plugin/mms_plugin/MmsPluginHttp.cpp
+++ b/plugin/mms_plugin/MmsPluginHttp.cpp
@@ -642,7 +642,7 @@ MMS_HTTP_ERROR_E MmsPluginHttpAgent::setSession(http_request_info_s &request_inf
 
 	if (transaction_type == MMS_HTTP_TRANSACTION_TYPE_POST) {
 		curl_easy_setopt(session_option, CURLOPT_POST, true);
-	 	curl_easy_setopt(session_option, CURLOPT_POSTFIELDS, request_info.post_data);
+		curl_easy_setopt(session_option, CURLOPT_POSTFIELDS, request_info.post_data);
 		curl_easy_setopt(session_option, CURLOPT_POSTFIELDSIZE, request_info.post_data_len);
 /*		curl_easy_setopt(session_option, CURLOPT_TCP_NODELAY, 1); */
 	}
diff --git a/plugin/mms_plugin/MmsPluginMain.cpp b/plugin/mms_plugin/MmsPluginMain.cpp
index 1081735..f5a1155 100755
--- a/plugin/mms_plugin/MmsPluginMain.cpp
+++ b/plugin/mms_plugin/MmsPluginMain.cpp
@@ -274,7 +274,7 @@ msg_error_t MmsComposeReadReport(MSG_MESSAGE_INFO_S *pMsgInfo)
 	MSG_BEGIN();
 
 	try {
- 		MmsPluginStorage::instance()->composeReadReport(pMsgInfo);
+		MmsPluginStorage::instance()->composeReadReport(pMsgInfo);
 	} catch (MsgException& e) {
 		MSG_FATAL("%s", e.what());
 		return MSG_ERR_PLUGIN_STORAGE;
diff --git a/plugin/mms_plugin/MmsPluginStorage.cpp b/plugin/mms_plugin/MmsPluginStorage.cpp
index 408c8bf..ab8595e 100755
--- a/plugin/mms_plugin/MmsPluginStorage.cpp
+++ b/plugin/mms_plugin/MmsPluginStorage.cpp
@@ -813,7 +813,7 @@ msg_error_t MmsPluginStorage::insertMultipart(msg_message_id_t msgId, MMS_MULTIP
 	}
 
 #if 0
-	/* ( MSG_ID INTEGER NOT NULL , SEQ INTEGER DEFAULT 0, CONTENT_TYPE TEXT, 	NAME TEXT, CHARSET INTEGER,	CONTENT_ID TEXT, CONTENT_LOCATION TEXT,	FILE_PATH TEXT, TEXT TEXT,); */
+	/* ( MSG_ID INTEGER NOT NULL , SEQ INTEGER DEFAULT 0, CONTENT_TYPE TEXT,	NAME TEXT, CHARSET INTEGER,	CONTENT_ID TEXT, CONTENT_LOCATION TEXT,	FILE_PATH TEXT, TEXT TEXT,); */
 	if (pMultipart->type == MIME_APPLICATION_SMIL) { /* Smil */
 		snprintf(sqlQuery, sizeof(sqlQuery), "INSERT INTO %s "
 				"(MSG_ID, SEQ, CONTENT_TYPE, NAME, CONTENT_ID, CONTENT_LOCATION, TEXT) "
diff --git a/plugin/mms_plugin/include/MmsPluginCodecTypes.h b/plugin/mms_plugin/include/MmsPluginCodecTypes.h
index 040cb52..41c7f21 100755
--- a/plugin/mms_plugin/include/MmsPluginCodecTypes.h
+++ b/plugin/mms_plugin/include/MmsPluginCodecTypes.h
@@ -68,7 +68,7 @@
 #define	MSG_MMS_CH_ADDR_DELIMETER	MSG_CH_ADDR_DELIMETER
 
 
-typedef unsigned int 			UINT;
+typedef unsigned int			UINT;
 typedef unsigned long int		UINT32;
 typedef unsigned char			UINT8;
 typedef unsigned short int		UINT16;
diff --git a/plugin/mms_plugin/include/MmsPluginComposer.h b/plugin/mms_plugin/include/MmsPluginComposer.h
index e0f304a..4a22126 100755
--- a/plugin/mms_plugin/include/MmsPluginComposer.h
+++ b/plugin/mms_plugin/include/MmsPluginComposer.h
@@ -28,7 +28,7 @@ public:
 	void composeNotiInd();
 	void composeDeliveryInd();
 	void composeReadOriInd();
-	void composeRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_SENDINGOPT_INFO_S *pSendOptInfo, MMS_DATA_S *pMmsData){};
+	void composeRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_SENDINGOPT_INFO_S *pSendOptInfo, MMS_DATA_S *pMmsData) {};
 
 	void composeSendReq(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_SENDINGOPT_INFO_S *pSendOptInfo, MMS_DATA_S *pMmsData);
 
diff --git a/plugin/mms_plugin/include/MmsPluginConnManWrapper.h b/plugin/mms_plugin/include/MmsPluginConnManWrapper.h
index 77f55da..b1a2748 100755
--- a/plugin/mms_plugin/include/MmsPluginConnManWrapper.h
+++ b/plugin/mms_plugin/include/MmsPluginConnManWrapper.h
@@ -23,7 +23,7 @@
 typedef enum {
 	MSG_CM_ERR_NONE = 0,
 	MSG_CM_ERR_UNKNOWN,
- } cm_error_e;
+} cm_error_e;
 
 class MmsPluginCmAgent {
 public:
diff --git a/plugin/mms_plugin/include/MmsPluginHttp.h b/plugin/mms_plugin/include/MmsPluginHttp.h
index d7a8f61..0f55870 100755
--- a/plugin/mms_plugin/include/MmsPluginHttp.h
+++ b/plugin/mms_plugin/include/MmsPluginHttp.h
@@ -72,45 +72,48 @@ typedef struct _http_session_info_s {
 } http_request_info_s;
 
 class MmsPluginHttpAgent {
-	public:
-		static MmsPluginHttpAgent *instance();
+public:
+	static MmsPluginHttpAgent *instance();
 
-		MMS_HTTP_ERROR_E httpRequest(http_request_info_s &request_info);
+	MMS_HTTP_ERROR_E httpRequest(http_request_info_s &request_info);
 
-		void setAbortFlag(){
-			MsgMutexLocker locker(mx);
-			abort = true;
-		};
+	void setAbortFlag()
+	{
+		MsgMutexLocker locker(mx);
+		abort = true;
+	};
 
-		bool getAbortFlag(){
-			MsgMutexLocker locker(mx);
-			return abort;
-		};
+	bool getAbortFlag()
+	{
+		MsgMutexLocker locker(mx);
+		return abort;
+	};
 
-	private:
-		static MmsPluginHttpAgent *pInstance;
+private:
+	static MmsPluginHttpAgent *pInstance;
 
-		MmsPluginHttpAgent();
-		~MmsPluginHttpAgent();
+	MmsPluginHttpAgent();
+	~MmsPluginHttpAgent();
 
-		void initSession();
-		MMS_HTTP_ERROR_E setSession(http_request_info_s &request_info);
-		MMS_HTTP_ERROR_E startTransaction();
-		void clearSession();
+	void initSession();
+	MMS_HTTP_ERROR_E setSession(http_request_info_s &request_info);
+	MMS_HTTP_ERROR_E startTransaction();
+	void clearSession();
 
-		void initAbortFlag(){
-			MsgMutexLocker locker(mx);
-			abort = false;
-		};
+	void initAbortFlag()
+	{
+		MsgMutexLocker locker(mx);
+		abort = false;
+	};
 
-		MMS_HTTP_TRANSACTION_TYPE_E transaction_type;
+	MMS_HTTP_TRANSACTION_TYPE_E transaction_type;
 
-		void *session_header;
-		void *session_option;
+	void *session_header;
+	void *session_option;
 
-		FILE *respfile;
-		bool abort;
-		MsgMutex mx;
+	FILE *respfile;
+	bool abort;
+	MsgMutex mx;
 };
 
 #endif /* MMS_PLUGIN_HTTP_H */
diff --git a/plugin/mms_plugin/include/MmsPluginInternal.h b/plugin/mms_plugin/include/MmsPluginInternal.h
index 8bed1c4..ee2909f 100755
--- a/plugin/mms_plugin/include/MmsPluginInternal.h
+++ b/plugin/mms_plugin/include/MmsPluginInternal.h
@@ -21,30 +21,30 @@
 #include "MmsPluginCodecTypes.h"
 
 class MmsPluginInternal {
-	public:
-		static MmsPluginInternal *instance();
-
-		void processReceivedInd(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_REQUEST_INFO_S *pRequest, bool *bReject);
-		void processSendConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTranQEntity *pRequest);
-		void processRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTranQEntity *pRequest, char *pRetrivedFilePath);
-		void processForwardConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTranQEntity *pRequest);
-		bool encodeNotifyRespInd(char *szTrID, msg_delivery_report_status_t iStatus, bool bReportAllowed, char *pSendFilePath);
-		bool encodeAckInd(char *szTrID, bool bReportAllowed, char *pSendFilePath);
-
-	private:
-		static MmsPluginInternal *pInstance;
-
-		MmsPluginInternal();
-		~MmsPluginInternal();
-
-		bool processNotiInd(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_REQUEST_INFO_S *pRequest);
-		void processDeliveryInd(MSG_MESSAGE_INFO_S *pMsgInfo);
-		void processReadOrgInd(MSG_MESSAGE_INFO_S *pMsgInfo);
-		bool checkRejectNotiInd(int roamState, bool bReportAllowed, char *pSendFilePath);
-		bool checkFilterMmsBody(MMS_DATA_S *pMmsData);
-		bool getMmsReport(MmsReport mmsReport);
-		const char *getMmsDeliveryStatus(msg_delivery_report_status_t deliveryStatus);
-		const char *getMmsReadStatus(msg_read_report_status_t readStatus);
+public:
+	static MmsPluginInternal *instance();
+
+	void processReceivedInd(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_REQUEST_INFO_S *pRequest, bool *bReject);
+	void processSendConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTranQEntity *pRequest);
+	void processRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTranQEntity *pRequest, char *pRetrivedFilePath);
+	void processForwardConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTranQEntity *pRequest);
+	bool encodeNotifyRespInd(char *szTrID, msg_delivery_report_status_t iStatus, bool bReportAllowed, char *pSendFilePath);
+	bool encodeAckInd(char *szTrID, bool bReportAllowed, char *pSendFilePath);
+
+private:
+	static MmsPluginInternal *pInstance;
+
+	MmsPluginInternal();
+	~MmsPluginInternal();
+
+	bool processNotiInd(MSG_MESSAGE_INFO_S *pMsgInfo, MSG_REQUEST_INFO_S *pRequest);
+	void processDeliveryInd(MSG_MESSAGE_INFO_S *pMsgInfo);
+	void processReadOrgInd(MSG_MESSAGE_INFO_S *pMsgInfo);
+	bool checkRejectNotiInd(int roamState, bool bReportAllowed, char *pSendFilePath);
+	bool checkFilterMmsBody(MMS_DATA_S *pMmsData);
+	bool getMmsReport(MmsReport mmsReport);
+	const char *getMmsDeliveryStatus(msg_delivery_report_status_t deliveryStatus);
+	const char *getMmsReadStatus(msg_read_report_status_t readStatus);
 };
 
 #endif /* MMS_PLUGIN_INTERNAL_H */
diff --git a/plugin/mms_plugin/include/MmsPluginTransport.h b/plugin/mms_plugin/include/MmsPluginTransport.h
index d3b2f1c..b73287a 100755
--- a/plugin/mms_plugin/include/MmsPluginTransport.h
+++ b/plugin/mms_plugin/include/MmsPluginTransport.h
@@ -20,17 +20,17 @@
 #include "MmsPluginTypes.h"
 
 class MmsPluginTransport {
-	public:
-		static MmsPluginTransport *instance();
+public:
+	static MmsPluginTransport *instance();
 
-		void submitRequest(const MSG_REQUEST_INFO_S *pReqInfo);
-		void cancelRequest(msg_request_id_t reqId);
+	void submitRequest(const MSG_REQUEST_INFO_S *pReqInfo);
+	void cancelRequest(msg_request_id_t reqId);
 
-	private:
-		MmsPluginTransport();
-		~MmsPluginTransport();
+private:
+	MmsPluginTransport();
+	~MmsPluginTransport();
 
-		static MmsPluginTransport *pInstance;
+	static MmsPluginTransport *pInstance;
 };
 
 #endif /* MMS_PLUGIN_TRANSPORT_H */
diff --git a/plugin/mms_plugin/include/MmsPluginUserAgent.h b/plugin/mms_plugin/include/MmsPluginUserAgent.h
index 4ae9227..cbdb838 100755
--- a/plugin/mms_plugin/include/MmsPluginUserAgent.h
+++ b/plugin/mms_plugin/include/MmsPluginUserAgent.h
@@ -23,36 +23,36 @@
 #include "MmsPluginTypes.h"
 
 class MmsPluginUaManager: public MsgThread {
-	public:
-		static MmsPluginUaManager *instance();
-		virtual void start();
+public:
+	static MmsPluginUaManager *instance();
+	virtual void start();
 
-		void addMmsReqEntity(mmsTranQEntity *req);
-		void getMmsPduData(mmsTranQEntity *qEntity);
-		bool processReceivedData(int msgId, char *pRcvdBody, int rcvdBodyLen, char *retrievedFilePath);
+	void addMmsReqEntity(mmsTranQEntity *req);
+	void getMmsPduData(mmsTranQEntity *qEntity);
+	bool processReceivedData(int msgId, char *pRcvdBody, int rcvdBodyLen, char *retrievedFilePath);
 
-		void lock() { mx.lock(); }
-		void unlock() { mx.unlock(); }
-		void wait() { cv.wait(mx.pMsgMutex()); }
-		void signal() { cv.signal(); }
+	void lock() { mx.lock(); }
+	void unlock() { mx.unlock(); }
+	void wait() { cv.wait(mx.pMsgMutex()); }
+	void signal() { cv.signal(); }
 
-	private:
-		MmsPluginUaManager();
-		~MmsPluginUaManager();
+private:
+	MmsPluginUaManager();
+	~MmsPluginUaManager();
 
-		static MmsPluginUaManager *pInstance;
-		virtual void run();
+	static MmsPluginUaManager *pInstance;
+	virtual void run();
 
-		MsgMutex mx;
-		MsgCndVar cv;
+	MsgMutex mx;
+	MsgCndVar cv;
 
-		MMS_NET_ERROR_T submitHandler(mmsTranQEntity *qEntity);
-		MMS_NET_ERROR_T waitingConf(mmsTranQEntity *qEntity);
+	MMS_NET_ERROR_T submitHandler(mmsTranQEntity *qEntity);
+	MMS_NET_ERROR_T waitingConf(mmsTranQEntity *qEntity);
 
-		/* condition values */
-		bool running;		/* flag for thread running */
+	/* condition values */
+	bool running;		/* flag for thread running */
 
-		MsgSimpleQ<mmsTranQEntity> mmsTranQ; /* transaction q for mms plugin */
+	MsgSimpleQ<mmsTranQEntity> mmsTranQ; /* transaction q for mms plugin */
 };
 
 #endif /* MMS_PLUGIN_USERAGENT_H */
diff --git a/plugin/sms_cdma_plugin/SmsCdmaPluginCodec.cpp b/plugin/sms_cdma_plugin/SmsCdmaPluginCodec.cpp
index 90afbba..b5151ad 100755
--- a/plugin/sms_cdma_plugin/SmsCdmaPluginCodec.cpp
+++ b/plugin/sms_cdma_plugin/SmsCdmaPluginCodec.cpp
@@ -2078,7 +2078,7 @@ int SmsPluginMsgCodec::encodeUserData(const unsigned char* src, unsigned char *d
 
 	unsigned char *tmp = (unsigned char *)calloc(1, src_size+1);
 	for (i = 0; i < src_size; i++) {
-        	tmp[i] = src[i] << 1;
+		tmp[i] = src[i] << 1;
 	}
 
 	j = 0;
diff --git a/plugin/sms_cdma_plugin/SmsCdmaPluginSetting.cpp b/plugin/sms_cdma_plugin/SmsCdmaPluginSetting.cpp
index 036c0dd..4bf694e 100755
--- a/plugin/sms_cdma_plugin/SmsCdmaPluginSetting.cpp
+++ b/plugin/sms_cdma_plugin/SmsCdmaPluginSetting.cpp
@@ -401,7 +401,7 @@ bool SmsPluginSetting::setCbConfig(const MSG_CBMSG_OPT_S *pCbOpt)
 	if (getResultFromSim() == true) {
 		MSG_DEBUG("######## Set Cb Config was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Set Cb Config was Failed !!! #######");
+		MSG_DEBUG("######## Set Cb Config was Failed !!! #######");
 		return false;
 	}
 #endif
@@ -426,7 +426,7 @@ bool SmsPluginSetting::getCbConfig(MSG_CBMSG_OPT_S *pCbOpt)
 	if (getCbConfigEvent(pCbOpt) == true) {
 		MSG_DEBUG("######## Get Cb Config was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Get Cb Config was Failed !!! #######");
+		MSG_DEBUG("######## Get Cb Config was Failed !!! #######");
 		return false;
 	}
 #endif
@@ -602,7 +602,7 @@ bool SmsPluginSetting::getMsisdnInfo(void)
 	if (getResultFromSim() == true) {
 		MSG_DEBUG("######## Get Sim msisdn was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Get Sim msisdn was Failed !!! #######");
+		MSG_DEBUG("######## Get Sim msisdn was Failed !!! #######");
 		return false;
 	}
 
diff --git a/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp b/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
index 6737c31..81aa8f0 100755
--- a/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
+++ b/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
@@ -47,8 +47,8 @@ SmsPluginTransport* SmsPluginTransport::pInstance = NULL;
 
 SmsPluginTransport::SmsPluginTransport()
 {
-	msgRef 		= 0x00;
-	msgRef8bit 	= 0x00;
+	msgRef		= 0x00;
+	msgRef8bit	= 0x00;
 	msgRef16bit	= 0x0000;
 
 	msgSeqNum   = 0x00;
diff --git a/plugin/sms_cdma_plugin/SmsCdmaPluginWapPushHandler.cpp b/plugin/sms_cdma_plugin/SmsCdmaPluginWapPushHandler.cpp
index c999797..48b3d16 100755
--- a/plugin/sms_cdma_plugin/SmsCdmaPluginWapPushHandler.cpp
+++ b/plugin/sms_cdma_plugin/SmsCdmaPluginWapPushHandler.cpp
@@ -1393,8 +1393,8 @@ void SmsPluginWapPushHandler::handleSIMessage(char* pPushBody, int PushBodyLen,
 	pushMsg.expires = 0xFFFFFFFF;
 
 	/* setting received time */
-	time_t 	t 		= 	time(NULL);
-	time_t 	utfTime	= 	time(&t);
+	time_t	t		=	time(NULL);
+	time_t	utfTime	=	time(&t);
 
 	pushMsg.received = (unsigned long)utfTime;
 
@@ -1545,8 +1545,8 @@ void SmsPluginWapPushHandler::handleSLMessage(char* pPushBody, int PushBodyLen,
 	}
 
 	/*  setting received time setting */
-	time_t 	t 		= 	time(NULL);
-	time_t 	utfTime	= 	time(&t);
+	time_t	t		=	time(NULL);
+	time_t	utfTime	=	time(&t);
 
 	pushMsg.received = (unsigned long)utfTime;
 
@@ -1905,7 +1905,7 @@ unsigned long SmsPluginWapPushHandler::convertXmlCharToSec(char* pDate)
 	struct tm	timeStruct;
 	time_t		nTimeInSec = 0;
 	char			tmpBuf[10];
-	int 			i = 0, index = 0;
+	int			i = 0, index = 0;
 
 	memset(tmpBuf, 0x00, sizeof(tmpBuf));
 	memset(&timeStruct, 0x00, sizeof(struct tm));
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginCallback.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginCallback.h
index 0e3e1f5..52f0468 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginCallback.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginCallback.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include <map>
 #include <vector>
@@ -35,7 +35,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     FUNCTION PROTOTYPES
+										FUNCTION PROTOTYPES
 ==================================================================================================*/
 void TapiEventDeviceReady(TapiHandle *handle, const char *noti_id, void *data, void *user_data);
 
@@ -59,7 +59,7 @@ void TapiEventGetMsisdnInfo(TapiHandle *handle, int result, void *data, void *us
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginCallback
 {
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginCodec.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginCodec.h
index d526bab..aa5560d 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginCodec.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginCodec.h
@@ -19,13 +19,13 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsCdmaPluginTypes.h"
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginMsgCodec
 {
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginEventHandler.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginEventHandler.h
index 2822883..5eb28cb 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginEventHandler.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginEventHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include <string>
 #include <map>
@@ -35,7 +35,7 @@ using namespace std;
 
 
 /*==================================================================================================
-                                     VARIABLES AND DEFINES
+										VARIABLES AND DEFINES
 ==================================================================================================*/
 struct wap_data_s {
 	int	length;
@@ -61,7 +61,7 @@ typedef struct _sms_wap_info_s {
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginEventHandler
 {
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginMain.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginMain.h
index 4fe2916..6eb4656 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginMain.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginMain.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsCdmaPluginTypes.h"
 #include "MsgPluginInterface.h"
@@ -32,7 +32,7 @@ extern "C"
 
 
 /*==================================================================================================
-                                     FUNCTION PROTOTYPES
+										FUNCTION PROTOTYPES
 ==================================================================================================*/
 msg_error_t SmsPlgInitialize();
 
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginSetting.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginSetting.h
index 5261057..c728178 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginSetting.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginSetting.h
@@ -19,14 +19,14 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 #include "MsgSettingTypes.h"
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginSetting
 {
@@ -78,12 +78,12 @@ private:
 	static SmsPluginSetting* pInstance;
 
 	MSG_SMSC_DATA_S		smscData;
-	MSG_CBMSG_OPT_S 	cbOpt;
+	MSG_CBMSG_OPT_S	cbOpt;
 
 	bool		bTapiResult;
 	bool		bUpdateVoicemailByMdn;
 
-	char 	meImei[MAX_ME_IMEI_LEN + 1];
+	char	meImei[MAX_ME_IMEI_LEN + 1];
 
 	MsgMutex mx;
 	MsgCndVar cv;
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginStorage.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginStorage.h
index c42631e..dfc48eb 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginStorage.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginStorage.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 
@@ -38,7 +38,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginStorage
 {
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginTransport.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginTransport.h
index 005c95d..be50e2b 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginTransport.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginTransport.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgInternalTypes.h"
 #include "MsgMutex.h"
@@ -31,7 +31,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginTransport
 {
@@ -59,12 +59,12 @@ private:
 	void convertMsgInfoToPtp(const MSG_MESSAGE_INFO_S *pMsgInfo, sms_trans_p2p_msg_s *pPtpMsg);
 	void convertMsgInfoToSubmit(const MSG_MESSAGE_INFO_S *pMsgInfo, sms_telesvc_submit_s *pSubmit);
 
-	unsigned char 		msgRef;
+	unsigned char		msgRef;
 	unsigned char		msgSeqNum;
 	unsigned char		msgSubmitId;
 
-	unsigned char 		msgRef8bit;
-	unsigned short 		msgRef16bit;
+	unsigned char		msgRef8bit;
+	unsigned short		msgRef16bit;
 
 	sms_network_status_t	curStatus;
 
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginTypes.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginTypes.h
index 80d764a..b66895c 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginTypes.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginTypes.h
@@ -83,7 +83,7 @@ typedef struct _SMS_WSP_METHOD_TYPE_S {
 typedef struct _SMS_WSP_SECURITY_TYPE_S {
 	char*         SecurityTypeName;
 	unsigned char SecurityTypeCode;
-}SMS_WSP_SECURITY_TYPE_S;
+} SMS_WSP_SECURITY_TYPE_S;
 
 
 typedef struct {
@@ -182,16 +182,16 @@ enum _sms_wap_app_code_e {
 };
 
 
-typedef unsigned char 	sms_network_status_t;	/* _sms_network_status_e */
+typedef unsigned char	sms_network_status_t;	/* _sms_network_status_e */
 
 /********************************************************************************/
-/*								TELESERVICE LAYER 								*/
+/*								TELESERVICE LAYER								*/
 /********************************************************************************/
 
 
-typedef bool 				sms_digit_mode_t;			/* _sms_digit_mode_e */
+typedef bool				sms_digit_mode_t;			/* _sms_digit_mode_e */
 
-typedef bool 				sms_number_mode_t;			/* _sms_number_mode_e */
+typedef bool				sms_number_mode_t;			/* _sms_number_mode_e */
 
 typedef unsigned char		sms_number_type_t;			/* _sms_number_type_e */
 
@@ -199,7 +199,7 @@ typedef unsigned char		sms_number_plan_t;			/* _sms_number_plan_e */
 
 
 typedef enum _sms_message_type_e {
-	SMS_TYPE_RESERVED 		= 0x00,		/* reserved */
+	SMS_TYPE_RESERVED		= 0x00,		/* reserved */
 	SMS_TYPE_DELIVER,					/* mobile-terminated only */
 	SMS_TYPE_SUBMIT,					/* mobile-originated only */
 	SMS_TYPE_CANCEL,					/* mobile-originated only */
@@ -209,7 +209,7 @@ typedef enum _sms_message_type_e {
 	SMS_TYPE_DELIVER_REPORT,			/* mobile-originated only */
 	SMS_TYPE_SUBMIT_REPORT	= 0x08,		/* mobile-terminated only */
 	SMS_TYPE_MAX_VALUE
-}sms_message_type_t;
+} sms_message_type_t;
 
 
 typedef enum _sms_alert_option_e {
@@ -226,7 +226,7 @@ typedef enum _sms_alert_option_e {
 	SMS_ALERT_HIGH_PRIORITY_ONCE,
 	SMS_ALERT_HIGH_PRIORITY_REPEAT,
 	SMS_ALERT_RESERVED
-}sms_alert_option_t;
+} sms_alert_option_t;
 
 
 typedef enum _sms_language_type_e {
@@ -238,7 +238,7 @@ typedef enum _sms_language_type_e {
 	SMS_LAN_KOREAN,
 	SMS_LAN_CHINESE,
 	SMS_LAN_HEBREW,
-}sms_language_type_t;
+} sms_language_type_t;
 
 
 typedef enum _sms_priority_indicator_e {
@@ -246,7 +246,7 @@ typedef enum _sms_priority_indicator_e {
 	SMS_PRIORITY_INTERACTIVE,
 	SMS_PRIORITY_URGENT,
 	SMS_PRIORITY_EMERGENCY
-}sms_priority_indicator_t;
+} sms_priority_indicator_t;
 
 
 typedef enum _sms_privacy_indicator_e {
@@ -254,7 +254,7 @@ typedef enum _sms_privacy_indicator_e {
 	SMS_PRIVACY_RESTRICTED,
 	SMS_PRIVACY_CONFIDENTIAL,
 	SMS_PRIVACY_SECRET
-}sms_privacy_indicator_t;
+} sms_privacy_indicator_t;
 
 
 typedef enum _sms_alert_priority_e {
@@ -262,7 +262,7 @@ typedef enum _sms_alert_priority_e {
 	SMS_ALERT_LOW_PRIORITY,
 	SMS_ALERT_MEDIUM_PRIORITY,
 	SMS_ALERT_HIGH_PRIORITY
-}sms_alert_priority_t;
+} sms_alert_priority_t;
 
 
 typedef enum _sms_display_mode_e {
@@ -270,7 +270,7 @@ typedef enum _sms_display_mode_e {
 	SMS_DISPLAY_DEFAULT_SETTING,
 	SMS_DISPLAY_USER_INVOKE,
 	SMS_DISPLAY_RESERVED
-}sms_display_mode_t;
+} sms_display_mode_t;
 
 
 typedef enum _sms_encoding_type_e {
@@ -287,7 +287,7 @@ typedef enum _sms_encoding_type_e {
 	SMS_ENCODE_GSMDCS = 0xa,
 	SMS_ENCODE_EUCKR = 0x10,
 	SMS_ENCODE_RESERVED
-}sms_encoding_type_t;
+} sms_encoding_type_t;
 
 
 typedef enum _sms_relative_time_e {
@@ -302,7 +302,7 @@ typedef enum _sms_relative_time_e {
 	SMS_REL_TIME_ACTIVE			= 247,
 	SMS_REL_TIME_REGISTRATION	= 248,
 	SMS_REL_TIME_RESERVED
-}sms_relative_time_t;
+} sms_relative_time_t;
 
 
 typedef enum _sms_status_code_e {
@@ -327,7 +327,7 @@ typedef enum _sms_status_code_e {
 	SMS_STATUS_PERMANENT_INVALID_DESTINATION	= 0xCA,
 	SMS_STATUS_PERMANENT_MESSAGE_EXPIRED	= 0xCD,
 	SMS_STATUS_PERMANENT_UNKNOWN_ERROR		= 0xDF,
-}sms_status_code_t;
+} sms_status_code_t;
 
 
 typedef enum _sms_cmae_category_e {
@@ -344,7 +344,7 @@ typedef enum _sms_cmae_category_e {
 	SMS_CMAE_CTG_CBRNE			= 0x0a,
 	SMS_CMAE_CTG_OTHER			= 0x0b,
 	SMS_CMAE_CTG_RESERVED,
-}sms_cmae_category_t;
+} sms_cmae_category_t;
 
 
 typedef enum _sms_cmae_response_type_e {
@@ -357,28 +357,28 @@ typedef enum _sms_cmae_response_type_e {
 	SMS_CMAE_RESP_TYPE_ASSESS				= 0x06,
 	SMS_CMAE_RESP_TYPE_NONE					= 0x07,
 	SMS_CMAE_RESP_TYPE_RESERVED,
-}sms_cmae_response_type_t;
+} sms_cmae_response_type_t;
 
 
 typedef enum _sms_cmae_severity_e {
 	SMS_CMAE_SEVERITY_EXTREME			= 0x0,
 	SMS_CMAE_SEVERITY_SEVERE				= 0x1,
 	SMS_CMAE_SEVERITY_RESERVED,
-}sms_cmae_severity_t;
+} sms_cmae_severity_t;
 
 
 typedef enum _sms_cmae_urgency_e {
 	SMS_CMAE_URGENCY_IMMEDIATE			= 0x0,
 	SMS_CMAE_URGENCY_EXPECTED			= 0x1,
 	SMS_CMAE_URGENCY_RESERVED,
-}sms_cmae_urgency_t;
+} sms_cmae_urgency_t;
 
 
 typedef enum _sms_cmae_certainty_e {
 	SMS_CMAE_CERTAINTY_OBSERVED			= 0x0,
 	SMS_CMAE_CERTAINTY_LIKELY			= 0x1,
 	SMS_CMAE_CERTAINTY_RESERVED,
-}sms_cmae_certainty_t;
+} sms_cmae_certainty_t;
 
 
 typedef enum _sms_cmae_alert_handle_e {
@@ -387,7 +387,7 @@ typedef enum _sms_cmae_alert_handle_e {
 	SMS_CMAE_ALERT_SEVERE					= 0x02,
 	SMS_CMAE_ALERT_AMBER						= 0x03,
 	SMS_CMAE_ALERT_RESERVED,
-}sms_cmae_alert_handle_t;
+} sms_cmae_alert_handle_t;
 
 
 enum _sms_bearer_sub_param_e {
@@ -487,9 +487,9 @@ enum _sms_tp_failure_cause_e {
 
 
 typedef struct _sms_trans_msg_id_s {
-	unsigned short 		msg_id;
+	unsigned short		msg_id;
 	bool				header_ind;
-}sms_trans_msg_id_s;
+} sms_trans_msg_id_s;
 
 
 typedef struct _sms_telesvc_addr_s {
@@ -498,7 +498,7 @@ typedef struct _sms_telesvc_addr_s {
 	sms_number_plan_t	number_plan;
 	unsigned int		addr_len;
 	char				szData[SMS_TRANS_ADDRESS_MAX_LEN + 1];
-}sms_telesvc_addr_s;
+} sms_telesvc_addr_s;
 
 
 typedef struct _sms_reply_option_s {
@@ -506,12 +506,12 @@ typedef struct _sms_reply_option_s {
 	bool	deliver_ack_req;
 	bool	read_ack_req;
 	bool	report_req;
-}sms_reply_option_s;
+} sms_reply_option_s;
 
 
 typedef struct _sms_time_relative_s {
 	sms_relative_time_t		rel_time;
-}sms_time_rel_s;
+} sms_time_rel_s;
 
 typedef struct _sms_time_stamp_s {
 	unsigned char		year;		/* range 00-99 (96~99 : 19xx, 00~95 : 20xx) */
@@ -520,23 +520,23 @@ typedef struct _sms_time_stamp_s {
 	unsigned char		hours;		/* range 0-23 */
 	unsigned char		minutes;	/* range 0-59 */
 	unsigned char		seconds;	/* range 0-59 */
-}sms_time_abs_s;
+} sms_time_abs_s;
 
 
 typedef struct _sms_val_period_s {
-	unsigned char 		format;
+	unsigned char		format;
 	union {
 		sms_time_rel_s	rel_time;
 		sms_time_abs_s	abs_time;
-	}time;
-}sms_val_period_s;
+	} time;
+} sms_val_period_s;
 
 
 typedef struct _sms_encoding_specific_s {
 	sms_encoding_type_t		encode_type;
 	unsigned int			data_len;
-	char 					user_data[SMS_MAX_USER_DATA_LEN +1];
-}sms_encoding_specific_s;
+	char					user_data[SMS_MAX_USER_DATA_LEN +1];
+} sms_encoding_specific_s;
 
 
 typedef struct _sms_ctg_specific_s {
@@ -547,14 +547,14 @@ typedef struct _sms_ctg_specific_s {
 	sms_alert_option_t	alert_option;
 	unsigned int		data_len;
 	char				user_data[SMS_MAX_USER_DATA_LEN +1];
-}sms_ctg_specific_s;
+} sms_ctg_specific_s;
 
 
 typedef struct _sms_svc_ctg_program_data_s {
 	sms_encoding_type_t		encode_type;
 	unsigned int			num_data;
 	sms_ctg_specific_s		*specific_data;
-}sms_svc_ctg_program_data_s;
+} sms_svc_ctg_program_data_s;
 
 
 typedef struct _sms_telesvc_userdata_s {
@@ -562,7 +562,7 @@ typedef struct _sms_telesvc_userdata_s {
 	unsigned char			msg_type;
 	unsigned int			data_len;
 	unsigned char			user_data[SMS_MAX_USER_DATA_LEN +1];
-}sms_telesvc_userdata_s;
+} sms_telesvc_userdata_s;
 
 
 typedef struct _sms_telesvc_cmasdata_s {
@@ -578,8 +578,8 @@ typedef struct _sms_telesvc_cmasdata_s {
 	sms_cmae_alert_handle_t			alert_handle;		/* 00:Presidential 01:Extreme 02:Severe 03:AMBER 04:Test */
 	sms_time_abs_s			expires;
 	sms_language_type_t		language;
-	bool 					is_wrong_recode_type;
-}sms_telesvc_cmasdata_s;
+	bool					is_wrong_recode_type;
+} sms_telesvc_cmasdata_s;
 
 
 typedef struct _sms_enhanced_vmn_s {
@@ -610,7 +610,7 @@ typedef struct _sms_enhanced_vmn_s {
 	sms_number_plan_t				cli_number_plan;
 	unsigned char					cli_num_field;
 	unsigned char					cli_char[SMS_MAX_USER_DATA_LEN+1];
-}sms_enhanced_vmn_s;
+} sms_enhanced_vmn_s;
 
 
 typedef struct _sms_enhanced_vmn_ack_s {
@@ -621,7 +621,7 @@ typedef struct _sms_enhanced_vmn_ack_s {
 
 	unsigned short				da_vm_msg_id[SMS_MAX_NUMBER_OF_ACK+1];
 	unsigned short				pa_vm_msg_id[SMS_MAX_NUMBER_OF_ACK+1];
-}sms_enhanced_vmn_ack_s;
+} sms_enhanced_vmn_ack_s;
 
 
 typedef struct _sms_telesvc_deliver_s {
@@ -644,7 +644,7 @@ typedef struct _sms_telesvc_deliver_s {
 	/* sms_svc_ctg_program_data_s	svc_ctg; */
 	sms_enhanced_vmn_s			enhanced_vmn;
 	sms_enhanced_vmn_ack_s		enhanced_vmn_ack;
-}sms_telesvc_deliver_s;
+} sms_telesvc_deliver_s;
 
 
 typedef struct _sms_telesvc_submit_s {
@@ -661,12 +661,12 @@ typedef struct _sms_telesvc_submit_s {
 	sms_encoding_specific_s		multi_encode_data;
 	unsigned char				deposit_id;
 	/* sms_svc_ctg_program_data_s	svc_ctg; */
-}sms_telesvc_submit_s;
+} sms_telesvc_submit_s;
 
 
 typedef struct _sms_telesvc_cancel_s {
 	sms_trans_msg_id_s		msg_id;
-}sms_telesvc_cancel_s;
+} sms_telesvc_cancel_s;
 
 
 typedef struct _sms_telesvc_user_ack_s {
@@ -676,7 +676,7 @@ typedef struct _sms_telesvc_user_ack_s {
 	sms_time_abs_s				time_stamp;
 	sms_encoding_specific_s		multi_encode_data;
 	unsigned char				deposit_id;
-}sms_telesvc_user_ack_s;
+} sms_telesvc_user_ack_s;
 
 
 typedef struct _sms_telesvc_deliver_ack_s {
@@ -685,7 +685,7 @@ typedef struct _sms_telesvc_deliver_ack_s {
 	sms_time_abs_s				time_stamp;
 	sms_encoding_specific_s		multi_encode_data;
 	sms_status_code_t			msg_status;
-}sms_telesvc_deliver_ack_s;
+} sms_telesvc_deliver_ack_s;
 
 
 typedef struct _sms_telesvc_read_ack_s {
@@ -694,7 +694,7 @@ typedef struct _sms_telesvc_read_ack_s {
 	sms_time_abs_s				time_stamp;
 	sms_encoding_specific_s		multi_encode_data;
 	unsigned char				deposit_id;
-}sms_telesvc_read_ack_s;
+} sms_telesvc_read_ack_s;
 
 typedef struct _sms_telesvc_deliver_report_s {
 	sms_trans_msg_id_s		msg_id;
@@ -702,7 +702,7 @@ typedef struct _sms_telesvc_deliver_report_s {
 	sms_telesvc_userdata_s	user_data;
 	sms_language_type_t		language;
 	unsigned char			multi_encode_data;
-}sms_telesvc_report_s;
+} sms_telesvc_report_s;
 
 
 typedef struct _sms_telesvc_msg_s {
@@ -715,21 +715,21 @@ typedef struct _sms_telesvc_msg_s {
 		sms_telesvc_user_ack_s			user_ack;
 		sms_telesvc_deliver_ack_s		delivery_ack;
 		sms_telesvc_read_ack_s			read_ack;
-		sms_telesvc_report_s 			report;
-	}data;
-}sms_telesvc_msg_s;
+		sms_telesvc_report_s			report;
+	} data;
+} sms_telesvc_msg_s;
 
 
 
 /********************************************************************************/
-/*								TRANSPORT LAYER 								*/
+/*								TRANSPORT LAYER								*/
 /********************************************************************************/
 
-typedef unsigned short 		sms_trans_param_id_t;		/* _sms_trans_param_id_e */
+typedef unsigned short		sms_trans_param_id_t;		/* _sms_trans_param_id_e */
 
-typedef unsigned short 		sms_trans_telesvc_id_t;		/* _sms_trans_telesvc_id_e */
+typedef unsigned short		sms_trans_telesvc_id_t;		/* _sms_trans_telesvc_id_e */
 
-typedef unsigned short 		sms_trans_svc_ctg_t;			/* _sms_trans_svc_ctg_e */
+typedef unsigned short		sms_trans_svc_ctg_t;			/* _sms_trans_svc_ctg_e */
 
 typedef unsigned char		sms_trans_reply_seq_t;
 
@@ -739,7 +739,7 @@ typedef enum _sms_trans_msg_type_e {
 	SMS_TRANS_BROADCAST_MSG		= 0x01,
 	SMS_TRANS_ACK_MSG			= 0x02,
 	SMS_TRANS_TYPE_RESERVED
-}sms_trans_msg_type_t;
+} sms_trans_msg_type_t;
 
 
 enum _sms_trans_param_id_e {
@@ -823,21 +823,21 @@ typedef enum _sms_trans_err_class_e {
 	SMS_TRANS_ERR_CLASS_NONE				= 0x00,
 	SMS_TRANS_ERR_CLASS_TEMPORARY			= 0x02,
 	SMS_TRANS_ERR_CLASS_PERMANENT			= 0x03
-}sms_trans_err_class_t;
+} sms_trans_err_class_t;
 
 
 typedef enum _sms_trans_cause_code_e {
 	SMS_CAUSE_CODE_INVAILD_TELESERVICE_ID		= 0x04,
 	SMS_CAUSE_CODE_SERVICE_TERMINATION_DENIED	= 0x62,
 	SMS_TODO_FILL_THIS_ENUMS
-}sms_trans_cause_code_t;
+} sms_trans_cause_code_t;
 
 
 typedef enum _sms_trans_sub_addr_type_e {
 	SMS_TRANS_SUB_ADDR_NSAP					= 0x00,
 	SMS_TRANS_SUB_ADDR_USER					= 0x01,
 	SMS_TRANS_SUB_ADDR_RESERVED
-}sms_trans_sub_addr_type_t;
+} sms_trans_sub_addr_type_t;
 
 
 
@@ -902,7 +902,7 @@ typedef struct _sms_trans_addr_s {
 	sms_number_plan_t	number_plan;
 	unsigned int		addr_len;
 	char				szData[SMS_TRANS_ADDRESS_MAX_LEN + 1];
-}sms_trans_addr_s;
+} sms_trans_addr_s;
 
 
 typedef struct _sms_trans_sub_addr_s {
@@ -910,14 +910,14 @@ typedef struct _sms_trans_sub_addr_s {
 	bool						odd;
 	unsigned int				addr_len;
 	char						szData[SMS_TRANS_ADDRESS_MAX_LEN + 1];
-}sms_trans_sub_addr_s;
+} sms_trans_sub_addr_s;
 
 
 typedef struct _sms_trans_cause_code_s {
 	sms_trans_reply_seq_t			reply_seq;
 	sms_trans_err_class_t			error_class;
 	sms_trans_cause_code_t			cause_code;
-}sms_trans_cause_code_s;
+} sms_trans_cause_code_s;
 
 
 typedef struct _sms_trans_p2p_msg_s {
@@ -927,20 +927,20 @@ typedef struct _sms_trans_p2p_msg_s {
 	sms_trans_sub_addr_s			sub_address;
 	sms_trans_reply_seq_t			reply_seq;
 	sms_telesvc_msg_s				telesvc_msg;
-}sms_trans_p2p_msg_s;
+} sms_trans_p2p_msg_s;
 
 
 typedef struct _sms_trans_broadcast_msg_s {
 	sms_trans_svc_ctg_t				svc_ctg;
 	sms_telesvc_msg_s				telesvc_msg;
-}sms_trans_broadcast_msg_s;
+} sms_trans_broadcast_msg_s;
 
 
 typedef struct _sms_trans_ack_msg_s {
 	sms_trans_addr_s				address;
 	sms_trans_sub_addr_s			sub_address;
 	sms_trans_cause_code_s			cause_code;
-}sms_trans_ack_msg_s;
+} sms_trans_ack_msg_s;
 
 
 typedef struct _sms_trans_msg_s {
@@ -949,8 +949,8 @@ typedef struct _sms_trans_msg_s {
 		sms_trans_p2p_msg_s			p2p_msg;
 		sms_trans_broadcast_msg_s	cb_msg;
 		sms_trans_ack_msg_s			ack_msg;
-	}data;
-}sms_trans_msg_s;
+	} data;
+} sms_trans_msg_s;
 
 
 #endif /* SMS_CDMA_PLUGIN_TYPES_H */
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginUAManager.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginUAManager.h
index 668df71..7e10580 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginUAManager.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginUAManager.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 #include "MsgQueue.h"
@@ -28,7 +28,7 @@
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginUAManager : public MsgThread
 {
@@ -42,10 +42,10 @@ public:
 private:
 	SmsPluginUAManager();
 	~SmsPluginUAManager();
-	void lock() 	{ mx.lock(); };
-	void unlock() 	{ mx.unlock(); };
-	void wait() 	{ cv.wait(mx.pMsgMutex()); };
-	void signal() 	{ cv.signal(); };
+	void lock()	{ mx.lock(); };
+	void unlock()	{ mx.unlock(); };
+	void wait()	{ cv.wait(mx.pMsgMutex()); };
+	void signal()	{ cv.signal(); };
 
 	virtual void run();
 
diff --git a/plugin/sms_cdma_plugin/include/SmsCdmaPluginWapPushHandler.h b/plugin/sms_cdma_plugin/include/SmsCdmaPluginWapPushHandler.h
index 4f14716..1f48043 100755
--- a/plugin/sms_cdma_plugin/include/SmsCdmaPluginWapPushHandler.h
+++ b/plugin/sms_cdma_plugin/include/SmsCdmaPluginWapPushHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include <wbxml/wbxml.h>
 #include <libxml/parser.h>
@@ -29,21 +29,21 @@
 
 
 /*==================================================================================================
-                                         DEFINES
+										DEFINES
 ==================================================================================================*/
-#define WSP_STANDARD_STR_LEN_MAX        255
-#define LENGTH_QUOTE  0x1F
+#define WSP_STANDARD_STR_LEN_MAX		255
+#define LENGTH_QUOTE						0x1F
 #define	NO_VALUE						0x00
 
 #define WSP_CODE_BUFFER_LEFT_LEN_MAX	1024
 #define WSP_CODE_BUFFER_RIGHT_LEN_MAX	2048
 
-#define  AcStrlen(x) ((x == NULL)?0:strlen(x))
+#define  AcStrlen(x) ((x == NULL) ? 0 : strlen(x))
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginWapPushHandler
 {
diff --git a/plugin/sms_plugin/SmsPluginParamCodec.cpp b/plugin/sms_plugin/SmsPluginParamCodec.cpp
index d605b62..0b952bd 100755
--- a/plugin/sms_plugin/SmsPluginParamCodec.cpp
+++ b/plugin/sms_plugin/SmsPluginParamCodec.cpp
@@ -284,7 +284,7 @@ int SmsPluginParamCodec::decodeAddress(const unsigned char *pTpdu, SMS_ADDRESS_S
 		convertBcdToDigit(&(pTpdu[offset]), bcdLen, &((pAddress->address)[0]));
 	}
 
-	offset += 	bcdLen;
+	offset +=	bcdLen;
 
 /*	MSG_DEBUG("address [%s]", pAddress->address);
 */
diff --git a/plugin/sms_plugin/SmsPluginSetting.cpp b/plugin/sms_plugin/SmsPluginSetting.cpp
index c1de8a4..b722e7b 100755
--- a/plugin/sms_plugin/SmsPluginSetting.cpp
+++ b/plugin/sms_plugin/SmsPluginSetting.cpp
@@ -717,7 +717,7 @@ void SmsPluginSetting::getParamList(MSG_SMSC_LIST_S *pSMSCList)
 			MSG_DEBUG("npi[%d]", pSMSCList->smscData[index].smscAddr.npi);
 			MSG_SEC_DEBUG("address[%s]", pSMSCList->smscData[index].smscAddr.address);
 		} else {
-		 	MSG_DEBUG("######## Get Parameter was Failed !!! #######");
+			MSG_DEBUG("######## Get Parameter was Failed !!! #######");
 		}
 	}
 
@@ -762,7 +762,7 @@ bool SmsPluginSetting::getParam(TapiHandle *handle, int Index, MSG_SMSC_DATA_S *
 	if (getParamEvent(handle, pSmscData) == true) {
 		MSG_DEBUG("######## Get Parameter was Successful !!! #######");
 	} else {
-	 	MSG_ERR("######## Get Parameter was Failed !!! #######");
+		MSG_ERR("######## Get Parameter was Failed !!! #######");
 		return false;
 	}
 
@@ -933,7 +933,7 @@ bool SmsPluginSetting::setCbConfig(const MSG_CBMSG_OPT_S *pCbOpt)
 		if (getResultFromSim() == true) {
 			MSG_DEBUG("######## Set Cb Config was Successful !!! #######");
 		} else {
-		 	MSG_ERR("######## Set Cb Config was Failed !!! #######");
+			MSG_ERR("######## Set Cb Config was Failed !!! #######");
 			return false;
 		}
 	}
@@ -967,7 +967,7 @@ bool SmsPluginSetting::getCbConfig(MSG_CBMSG_OPT_S *pCbOpt)
 	if (getCbConfigEvent(pCbOpt) == true) {
 		MSG_DEBUG("######## Get Cb Config was Successful !!! #######");
 	} else {
-	 	MSG_ERR("######## Get Cb Config was Failed !!! #######");
+		MSG_ERR("######## Get Cb Config was Failed !!! #######");
 		return false;
 	}
 
@@ -1129,7 +1129,7 @@ bool SmsPluginSetting::getVoiceMailInfo(TapiHandle *handle)
 	if (getMailboxInfoEvent() == true) {
 		MSG_DEBUG("######## Get mailbox info was Successful !!! #######");
 	} else {
-	 	MSG_ERR("######## Get mailbox info was Failed !!! #######");
+		MSG_ERR("######## Get mailbox info was Failed !!! #######");
 		return false;
 	}
 
@@ -1296,7 +1296,7 @@ bool SmsPluginSetting::getMwiInfo(TapiHandle *handle)
 	if (getResultFromSim() == true) {
 		MSG_DEBUG("######## Get Mainbox info was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Get Mainbox info was Failed !!! #######");
+		MSG_DEBUG("######## Get Mainbox info was Failed !!! #######");
 		return false;
 	}
 
@@ -1322,7 +1322,7 @@ bool SmsPluginSetting::getMsisdnInfo(TapiHandle *handle)
 	if (getResultFromSim() == true) {
 		MSG_DEBUG("######## Get Sim msisdn was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Get Sim msisdn was Failed !!! #######");
+		MSG_DEBUG("######## Get Sim msisdn was Failed !!! #######");
 		return false;
 	}
 
@@ -1348,7 +1348,7 @@ bool SmsPluginSetting::getSimServiceTable(TapiHandle *handle)
 	if (getResultFromSim() == true) {
 		MSG_DEBUG("######## Get SST info was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Get SST info was Failed !!! #######");
+		MSG_DEBUG("######## Get SST info was Failed !!! #######");
 		return false;
 	}
 
diff --git a/plugin/sms_plugin/SmsPluginSimMsg.cpp b/plugin/sms_plugin/SmsPluginSimMsg.cpp
index b234498..730d53f 100755
--- a/plugin/sms_plugin/SmsPluginSimMsg.cpp
+++ b/plugin/sms_plugin/SmsPluginSimMsg.cpp
@@ -268,7 +268,7 @@ msg_error_t SmsPluginSimMsg::saveSimMessage(const MSG_MESSAGE_INFO_S *pMsgInfo,
 			if (ret == TAPI_API_SUCCESS) {
 				MSG_DEBUG("########  tel_write_sms_in_sim Success !!!#######");
 			} else {
-			 	MSG_DEBUG("########  tel_write_sms_in_sim Fail !!! return : [%d] #######", ret);
+				MSG_DEBUG("########  tel_write_sms_in_sim Fail !!! return : [%d] #######", ret);
 
 				return MSG_ERR_PLUGIN_STORAGE;
 			}
@@ -298,7 +298,7 @@ msg_error_t SmsPluginSimMsg::saveSimMessage(const MSG_MESSAGE_INFO_S *pMsgInfo,
 				pSimIdList->simId[pSimIdList->count] = SimId;
 				pSimIdList->count++;
 			} else {
-			 	MSG_DEBUG("########  Saving Msg was Failed !!! SIM ID : [%d] #######", SimId);
+				MSG_DEBUG("########  Saving Msg was Failed !!! SIM ID : [%d] #######", SimId);
 
 				return MSG_ERR_PLUGIN_STORAGE;
 			}
@@ -440,7 +440,7 @@ msg_error_t SmsPluginSimMsg::saveClass2Message(const MSG_MESSAGE_INFO_S *pMsgInf
 			if (tapiRet == TAPI_API_SUCCESS) {
 				MSG_DEBUG("########  tel_write_sms_in_sim Success !!!, segNum = [%d] #######", segCnt);
 			} else {
-			 	MSG_DEBUG("########  tel_write_sms_in_sim Fail !!! return : [%d] #######", tapiRet);
+				MSG_DEBUG("########  tel_write_sms_in_sim Fail !!! return : [%d] #######", tapiRet);
 
 				SmsPluginTransport::instance()->sendDeliverReport(handle, MSG_ERR_STORAGE_ERROR);
 
@@ -467,7 +467,7 @@ void SmsPluginSimMsg::deleteSimMessage(msg_sim_slot_id_t sim_idx, msg_sim_id_t S
 	if (tapiRet == TAPI_API_SUCCESS)
 		MSG_DEBUG("########  tel_delete_sms_in_sim Success !!! #######");
 	else
-	 	THROW(MsgException::SMS_PLG_ERROR, "########  tel_delete_sms_in_sim Fail !!! return : [%d] #######", tapiRet);
+		THROW(MsgException::SMS_PLG_ERROR, "########  tel_delete_sms_in_sim Fail !!! return : [%d] #######", tapiRet);
 
 	int SimId = 0;
 	bool bResult = false;
@@ -507,7 +507,7 @@ void SmsPluginSimMsg::deleteSimMessage(msg_sim_slot_id_t sim_idx, msg_sim_id_t S
 		if (MsgSettingSetInt(keyName, usedCnt) != MSG_SUCCESS)
 			MSG_DEBUG("Error to set config data [%s]", keyName);
 	} else {
-	 	THROW(MsgException::SMS_PLG_ERROR, "########  Deleting Msg was Failed !!! SIM ID : [%d] #######", SimId);
+		THROW(MsgException::SMS_PLG_ERROR, "########  Deleting Msg was Failed !!! SIM ID : [%d] #######", SimId);
 	}
 }
 
@@ -560,7 +560,7 @@ void SmsPluginSimMsg::setReadStatus(msg_sim_slot_id_t sim_idx, msg_sim_id_t SimM
 	if (bResult == true)
 		MSG_DEBUG("######## Setting Read Status was Successful !!!, sim id=[%d] #######", SimId);
 	else
-	 	THROW(MsgException::SMS_PLG_ERROR, "######## Setting Read Status was Failed !!! #######");
+		THROW(MsgException::SMS_PLG_ERROR, "######## Setting Read Status was Failed !!! #######");
 }
 
 
@@ -578,7 +578,7 @@ void SmsPluginSimMsg::getSimMsgCount(TapiHandle *handle, MSG_SIM_COUNT_S *pSimMs
 	if (getSimMsgCntEvent(handle, pSimMsgCnt) == true)
 		MSG_DEBUG("######## Get Sim Msg Count was Successful !!! #######");
 	else
-	 	THROW(MsgException::SMS_PLG_ERROR, "######## Get Sim Msg Count was Failed !!! #######");
+		THROW(MsgException::SMS_PLG_ERROR, "######## Get Sim Msg Count was Failed !!! #######");
 }
 
 
@@ -598,7 +598,7 @@ bool SmsPluginSimMsg::getSimMsg(TapiHandle *handle, msg_sim_id_t SimMsgId, MSG_M
 	if (getSimMsgEvent(handle, pMsgInfo) == true) {
 		MSG_DEBUG("######## Get Sim Msg was Successful !!! #######");
 	} else {
-	 	MSG_DEBUG("######## Get Sim Msg was Failed !!! #######");
+		MSG_DEBUG("######## Get Sim Msg was Failed !!! #######");
 		return false;
 	}
 
diff --git a/plugin/sms_plugin/SmsPluginTransport.cpp b/plugin/sms_plugin/SmsPluginTransport.cpp
index c0501b7..21af915 100755
--- a/plugin/sms_plugin/SmsPluginTransport.cpp
+++ b/plugin/sms_plugin/SmsPluginTransport.cpp
@@ -50,8 +50,8 @@ SmsPluginTransport* SmsPluginTransport::pInstance = NULL;
 
 SmsPluginTransport::SmsPluginTransport()
 {
-	msgRef 		= 0x00;
-	msgRef8bit 	= 0x00;
+	msgRef		= 0x00;
+	msgRef8bit	= 0x00;
 	msgRef16bit	= 0x0000;
 	curStatus	= 0x00;
 	memset(&curMoCtrlData, 0x00, sizeof(curMoCtrlData));
diff --git a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
index 6f8191a..e76d1f6 100755
--- a/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
+++ b/plugin/sms_plugin/SmsPluginWapPushHandler.cpp
@@ -2052,7 +2052,7 @@ unsigned long SmsPluginWapPushHandler::convertXmlCharToSec(char* pDate)
 	struct tm	timeStruct;
 	time_t		nTimeInSec = 0;
 	char			tmpBuf[10];
-	int 			i = 0, index = 0;
+	int			i = 0, index = 0;
 
 	memset(tmpBuf, 0x00, sizeof(tmpBuf));
 	memset(&timeStruct, 0x00, sizeof(struct tm));
diff --git a/plugin/sms_plugin/include/SmsPluginCallback.h b/plugin/sms_plugin/include/SmsPluginCallback.h
index a230c0a..81d3f89 100755
--- a/plugin/sms_plugin/include/SmsPluginCallback.h
+++ b/plugin/sms_plugin/include/SmsPluginCallback.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include <map>
 #include <vector>
@@ -35,7 +35,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     FUNCTION PROTOTYPES
+										FUNCTION PROTOTYPES
 ==================================================================================================*/
 void TapiEventDeviceReady(TapiHandle *handle, const char *noti_id, void *data, void *user_data);
 
@@ -92,7 +92,7 @@ void TapiEventSimRefreshed(TapiHandle *handle, const char *noti_id, void *data,
 SMS_NETWORK_STATUS_T convertTapiRespToSmsPlugin(int result);
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginCallback
 {
diff --git a/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h b/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h
index 2358217..acc96b7 100755
--- a/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h
+++ b/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include <map>
 #include <vector>
@@ -38,13 +38,12 @@ extern "C"
 
 
 /*==================================================================================================
-                                         VARIABLES
+											VARIABLES
 ==================================================================================================*/
 typedef map<unsigned char, SMS_CBMSG_PAGE_S> cbPageMap;
 
 
-typedef struct _CB_PAGE_INFO_S
-{
+typedef struct _CB_PAGE_INFO_S {
 	unsigned char		geoScope;
 	unsigned char		updateNum;
 	unsigned short		msgCode;
@@ -58,7 +57,7 @@ typedef struct _CB_PAGE_INFO_S
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+											CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginCbMsgHandler
 {
diff --git a/plugin/sms_plugin/include/SmsPluginConcatHandler.h b/plugin/sms_plugin/include/SmsPluginConcatHandler.h
index 4ab5533..25c9cd3 100755
--- a/plugin/sms_plugin/include/SmsPluginConcatHandler.h
+++ b/plugin/sms_plugin/include/SmsPluginConcatHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include <string>
 #include <map>
@@ -32,20 +32,18 @@ using namespace std;
 
 
 /*==================================================================================================
-                                         VARIABLES AND DEFINES
+											VARIABLES AND DEFINES
 ==================================================================================================*/
 #define MAX_CONCAT_LIST	10
 
-struct CONCAT_DATA_S
-{
+struct CONCAT_DATA_S {
 	int	length;
 	char data[MAX_USER_DATA_LEN+1];
 };
 
 typedef map<unsigned char, CONCAT_DATA_S> concatDataMap;
 
-typedef struct _SMS_CONCAT_MSG_S
-{
+typedef struct _SMS_CONCAT_MSG_S {
 	unsigned short		msgRef;
 	unsigned char		totalSeg;
 	unsigned char		seqNum;
@@ -55,11 +53,10 @@ typedef struct _SMS_CONCAT_MSG_S
 	SMS_DCS_S		dcs;
 	bool				bRead;
 	int				simId;
-	int 			simIndex;
+	int			simIndex;
 } SMS_CONCAT_MSG_S;
 
-typedef struct _SMS_CONCAT_INFO_S
-{
+typedef struct _SMS_CONCAT_INFO_S {
 	unsigned short		msgRef;
 	unsigned char		totalSeg;
 	unsigned char		segCnt;
@@ -76,15 +73,14 @@ typedef struct _SMS_CONCAT_INFO_S
 	int				simIndex;
 } SMS_CONCAT_INFO_S;
 
-typedef struct _SMS_SIM_ID_S
-{
+typedef struct _SMS_SIM_ID_S {
 	unsigned short		msgRef;
 	msg_sim_id_t		simId;
 } SMS_SIM_ID_S;
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginConcatHandler
 {
diff --git a/plugin/sms_plugin/include/SmsPluginDSHandler.h b/plugin/sms_plugin/include/SmsPluginDSHandler.h
index 291b8e4..6720e50 100755
--- a/plugin/sms_plugin/include/SmsPluginDSHandler.h
+++ b/plugin/sms_plugin/include/SmsPluginDSHandler.h
@@ -19,13 +19,13 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include "SmsPluginTypes.h"
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+											CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginDSHandler
 {
diff --git a/plugin/sms_plugin/include/SmsPluginEventHandler.h b/plugin/sms_plugin/include/SmsPluginEventHandler.h
index 78cbd68..035f33a 100755
--- a/plugin/sms_plugin/include/SmsPluginEventHandler.h
+++ b/plugin/sms_plugin/include/SmsPluginEventHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 #include "MsgTextConvert.h"
@@ -28,7 +28,7 @@
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+											CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginEventHandler
 {
diff --git a/plugin/sms_plugin/include/SmsPluginMain.h b/plugin/sms_plugin/include/SmsPluginMain.h
index ec9a89d..05a0ced 100755
--- a/plugin/sms_plugin/include/SmsPluginMain.h
+++ b/plugin/sms_plugin/include/SmsPluginMain.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsPluginTypes.h"
 #include "MsgPluginInterface.h"
@@ -32,7 +32,7 @@ extern "C"
 
 
 /*==================================================================================================
-                                     FUNCTION PROTOTYPES
+										FUNCTION PROTOTYPES
 ==================================================================================================*/
 msg_error_t SmsPlgInitialize();
 
diff --git a/plugin/sms_plugin/include/SmsPluginParamCodec.h b/plugin/sms_plugin/include/SmsPluginParamCodec.h
index 715a971..3784c70 100755
--- a/plugin/sms_plugin/include/SmsPluginParamCodec.h
+++ b/plugin/sms_plugin/include/SmsPluginParamCodec.h
@@ -19,13 +19,13 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsPluginTypes.h"
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginParamCodec
 {
diff --git a/plugin/sms_plugin/include/SmsPluginSatHandler.h b/plugin/sms_plugin/include/SmsPluginSatHandler.h
index 288e4b5..09afc22 100755
--- a/plugin/sms_plugin/include/SmsPluginSatHandler.h
+++ b/plugin/sms_plugin/include/SmsPluginSatHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsPluginTypes.h"
 #include "MsgMutex.h"
@@ -30,7 +30,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginSatHandler
 {
diff --git a/plugin/sms_plugin/include/SmsPluginSetting.h b/plugin/sms_plugin/include/SmsPluginSetting.h
index 741add8..0b9093a 100755
--- a/plugin/sms_plugin/include/SmsPluginSetting.h
+++ b/plugin/sms_plugin/include/SmsPluginSetting.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 #include "MsgSettingTypes.h"
@@ -37,7 +37,7 @@ typedef map <int, SMS_SIM_MWI_INFO_S> simMwiInfoMap;
 typedef map <int, MSG_CBMSG_OPT_S>	cbOptMap;
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+											CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginSetting
 {
@@ -111,8 +111,8 @@ private:
 	std::list<TapiHandle *> tel_handle_list;
 
 	/* Setting values for keeping in setting instance */
-	smscListMap 			smscList;
-	MSG_SIM_STATUS_T 		simStatus[MAX_TELEPHONY_HANDLE_CNT+1];
+	smscListMap			smscList;
+	MSG_SIM_STATUS_T		simStatus[MAX_TELEPHONY_HANDLE_CNT+1];
 	MSG_SMSC_DATA_S			smscData[MAX_TELEPHONY_HANDLE_CNT+1];
 	smsSimMailboxListMap	simMailboxList;
 	simMwiInfoMap			simMwiInfo;
@@ -122,10 +122,10 @@ private:
 	bool	bTapiResult;
 	int		paramCnt;
 	int		selectedParam;
-	int 	selectedSimIndex;
-	char 	meImei[MAX_ME_IMEI_LEN + 1];
+	int	selectedSimIndex;
+	char	meImei[MAX_ME_IMEI_LEN + 1];
 
-	bool 	bMbdnEnable[MAX_TELEPHONY_HANDLE_CNT];
+	bool	bMbdnEnable[MAX_TELEPHONY_HANDLE_CNT];
 
 	MsgMutex mx;
 	MsgCndVar cv;
diff --git a/plugin/sms_plugin/include/SmsPluginSimMsg.h b/plugin/sms_plugin/include/SmsPluginSimMsg.h
index 2d8c54a..4ea6b5b 100755
--- a/plugin/sms_plugin/include/SmsPluginSimMsg.h
+++ b/plugin/sms_plugin/include/SmsPluginSimMsg.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 
@@ -36,7 +36,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+											CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginSimMsg
 {
@@ -82,15 +82,15 @@ private:
 
 	msg_sim_id_t				simMsgId;
 	int				delSimMsgId;
-	int 		simIdList[MAX_SIM_SMS_NUM];		/** send total simIds to handleSimMsg **/
+	int		simIdList[MAX_SIM_SMS_NUM];		/** send total simIds to handleSimMsg **/
 
 	MSG_SIM_COUNT_S			simMsgCnt;
 
 	MSG_MESSAGE_INFO_S		simMsgInfo;
 	MSG_ADDRESS_INFO_S		simAddrInfo;
 
-	int 					usedCnt;
-	int 					totalCnt;
+	int					usedCnt;
+	int					totalCnt;
 
 	bool						bTapiResult;
 
diff --git a/plugin/sms_plugin/include/SmsPluginStorage.h b/plugin/sms_plugin/include/SmsPluginStorage.h
index 5df8f70..d2b5673 100755
--- a/plugin/sms_plugin/include/SmsPluginStorage.h
+++ b/plugin/sms_plugin/include/SmsPluginStorage.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 
@@ -38,7 +38,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginStorage
 {
@@ -85,7 +85,7 @@ private:
 	MSG_ADDRESS_INFO_S addrInfo;
 
 	std::list<PUSH_APPLICATION_INFO_S> pushAppInfoList;
-//	unsigned char tmpMsgRef;
+	/* unsigned char tmpMsgRef; */
 };
 
 #endif /* SMS_PLUGIN_STORAGE_H */
diff --git a/plugin/sms_plugin/include/SmsPluginTpduCodec.h b/plugin/sms_plugin/include/SmsPluginTpduCodec.h
index f206185..d6ec9b2 100755
--- a/plugin/sms_plugin/include/SmsPluginTpduCodec.h
+++ b/plugin/sms_plugin/include/SmsPluginTpduCodec.h
@@ -19,13 +19,13 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsPluginTypes.h"
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginTpduCodec
 {
diff --git a/plugin/sms_plugin/include/SmsPluginTransport.h b/plugin/sms_plugin/include/SmsPluginTransport.h
index 44f595c..5fea01f 100755
--- a/plugin/sms_plugin/include/SmsPluginTransport.h
+++ b/plugin/sms_plugin/include/SmsPluginTransport.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 #include "MsgTextConvert.h"
@@ -34,7 +34,7 @@ extern "C"
 }
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginTransport
 {
@@ -72,10 +72,10 @@ private:
 
 	static SmsPluginTransport* pInstance;
 
-	unsigned char 		msgRef;
+	unsigned char		msgRef;
 
-	unsigned char 		msgRef8bit;
-	unsigned short 	msgRef16bit;
+	unsigned char		msgRef8bit;
+	unsigned short	msgRef16bit;
 
 	SMS_NETWORK_STATUS_T curStatus;
 	TelSatMoSmCtrlIndData_t curMoCtrlData;
diff --git a/plugin/sms_plugin/include/SmsPluginTypes.h b/plugin/sms_plugin/include/SmsPluginTypes.h
index 646947f..e128e7a 100755
--- a/plugin/sms_plugin/include/SmsPluginTypes.h
+++ b/plugin/sms_plugin/include/SmsPluginTypes.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "MsgTextConvert.h"
 #include "MsgInternalTypes.h"
@@ -32,16 +32,16 @@ extern "C"
 }
 
 /*==================================================================================================
-                                    DEFINES
+										DEFINES
 ==================================================================================================*/
-#define MAX_ADDRESS_LEN 			21 /* including '+' */
-#define MAX_USER_DATA_LEN 			160
-#define MAX_GSM_7BIT_DATA_LEN 		160
-#define MAX_UCS2_DATA_LEN 			140
+#define MAX_ADDRESS_LEN			21 /* including '+' */
+#define MAX_USER_DATA_LEN			160
+#define MAX_GSM_7BIT_DATA_LEN		160
+#define MAX_UCS2_DATA_LEN			140
 /* #define MAX_TPDU_DATA_LEN			165 */
 #define MAX_TPDU_DATA_LEN			255
 #define MAX_SMS_SEND_RETRY			4
-#define MAX_SMSC_LEN 				20
+#define MAX_SMSC_LEN				20
 #define MAX_ADD_PARAM_LEN			12
 #define MAX_DCS_PARAM_LEN			1
 #define MAX_ABS_TIME_PARAM_LEN		7
@@ -67,7 +67,7 @@ extern "C"
 
 
 /*==================================================================================================
-                                         TYPES
+										TYPES
 ==================================================================================================*/
 
 typedef unsigned char SMS_TPDU_TYPE_T;		/* _SMS_TPDU_TYPE_E */
@@ -119,7 +119,7 @@ typedef unsigned char SMS_SIM_MAILBOX_TYPE_T;	/* _SMS_SIM_MAILBOX_TYPE_E */
 typedef unsigned char SMS_NETWORK_STATUS_T;	/* _SMS_NETWORK_STATUS_E */
 
 /*==================================================================================================
-                                    ENUMS
+										ENUMS
 ==================================================================================================*/
 enum _SMS_TPDU_TYPE_E {
 	SMS_TPDU_SUBMIT,
@@ -399,43 +399,43 @@ enum _SMS_CBMSG_TYPE_E {
 
 
 enum _SMS_CBMSG_LANG_TYPE_E {
-	SMS_CBMSG_LANG_GERMAN      		= 0x00,
-	SMS_CBMSG_LANG_ENGLISH     		= 0x01,
-	SMS_CBMSG_LANG_ITALIAN     		= 0x02,
-	SMS_CBMSG_LANG_FRENCH      		= 0x03,
-	SMS_CBMSG_LANG_SPANISH     		= 0x04,
-	SMS_CBMSG_LANG_DUTCH       		= 0x05,
-	SMS_CBMSG_LANG_SWEDISH     	= 0x06,
-	SMS_CBMSG_LANG_DANISH      		= 0x07,
-	SMS_CBMSG_LANG_PORTUGUESE  	= 0x08,
-	SMS_CBMSG_LANG_FINNISH     		= 0x09,
-	SMS_CBMSG_LANG_NORWEGIAN   	= 0x0a,
-	SMS_CBMSG_LANG_GREEK       		= 0x0b,
-	SMS_CBMSG_LANG_TURKISH     		= 0x0c,
-	SMS_CBMSG_LANG_HUNGARIAN  	= 0x0d,
-	SMS_CBMSG_LANG_POLISH      		= 0x0e,
-	SMS_CBMSG_LANG_UNSPECIFIED 	= 0x0f,
-
-	SMS_CBMSG_LANG_ISO639		= 0x10,
-
-	SMS_CBMSG_LANG_CZECH       		= 0x20,
-	SMS_CBMSG_LANG_HEBREW 		= 0x21,
-	SMS_CBMSG_LANG_ARABIC 		= 0x22,
-	SMS_CBMSG_LANG_RUSSIAN 		= 0x23,
-	SMS_CBMSG_LANG_ICELANDIC 		= 0x24,
-	SMS_CBMSG_LANG_RESERVED_25 	= 0x25,
+	SMS_CBMSG_LANG_GERMAN			= 0x00,
+	SMS_CBMSG_LANG_ENGLISH			= 0x01,
+	SMS_CBMSG_LANG_ITALIAN			= 0x02,
+	SMS_CBMSG_LANG_FRENCH			= 0x03,
+	SMS_CBMSG_LANG_SPANISH			= 0x04,
+	SMS_CBMSG_LANG_DUTCH				= 0x05,
+	SMS_CBMSG_LANG_SWEDISH			= 0x06,
+	SMS_CBMSG_LANG_DANISH			= 0x07,
+	SMS_CBMSG_LANG_PORTUGUESE		= 0x08,
+	SMS_CBMSG_LANG_FINNISH			= 0x09,
+	SMS_CBMSG_LANG_NORWEGIAN			= 0x0a,
+	SMS_CBMSG_LANG_GREEK				= 0x0b,
+	SMS_CBMSG_LANG_TURKISH			= 0x0c,
+	SMS_CBMSG_LANG_HUNGARIAN			= 0x0d,
+	SMS_CBMSG_LANG_POLISH			= 0x0e,
+	SMS_CBMSG_LANG_UNSPECIFIED		= 0x0f,
+
+	SMS_CBMSG_LANG_ISO639			= 0x10,
+
+	SMS_CBMSG_LANG_CZECH			= 0x20,
+	SMS_CBMSG_LANG_HEBREW		= 0x21,
+	SMS_CBMSG_LANG_ARABIC		= 0x22,
+	SMS_CBMSG_LANG_RUSSIAN		= 0x23,
+	SMS_CBMSG_LANG_ICELANDIC		= 0x24,
+	SMS_CBMSG_LANG_RESERVED_25	= 0x25,
 	SMS_CBMSG_LANG_RESERVED_26	= 0x26,
-	SMS_CBMSG_LANG_RESERVED_27 	= 0x27,
-	SMS_CBMSG_LANG_RESERVED_28 	= 0x28,
-	SMS_CBMSG_LANG_RESERVED_29 	= 0x29,
-	SMS_CBMSG_LANG_RESERVED_2A 	= 0x2a,
-	SMS_CBMSG_LANG_RESERVED_2B 	= 0x2b,
-	SMS_CBMSG_LANG_RESERVED_2C 	= 0x2c,
+	SMS_CBMSG_LANG_RESERVED_27	= 0x27,
+	SMS_CBMSG_LANG_RESERVED_28	= 0x28,
+	SMS_CBMSG_LANG_RESERVED_29	= 0x29,
+	SMS_CBMSG_LANG_RESERVED_2A	= 0x2a,
+	SMS_CBMSG_LANG_RESERVED_2B	= 0x2b,
+	SMS_CBMSG_LANG_RESERVED_2C	= 0x2c,
 	SMS_CBMSG_LANG_RESERVED_2D	= 0x2d,
-	SMS_CBMSG_LANG_RESERVED_2E 	= 0x2e,
-	SMS_CBMSG_LANG_RESERVED_2F 	= 0x2f,
+	SMS_CBMSG_LANG_RESERVED_2E	= 0x2e,
+	SMS_CBMSG_LANG_RESERVED_2F	= 0x2f,
 
-	SMS_CBMSG_LANG_DUMMY       		= 0xFF
+	SMS_CBMSG_LANG_DUMMY			= 0xFF
 };
 
 
@@ -458,8 +458,8 @@ enum _SMS_SIM_EFILE_NAME_E {
 	SMS_SIM_EFILE_USIM_SMSP	= 0x6A42,		/** < USIM SMS parameter */
 	SMS_SIM_EFILE_USIM_SMSS	= 0x6A43,		/** < USIM SMS status */
 	SMS_SIM_EFILE_USIM_CBMI	= 0x6A45,		/** < USIM Cell Broadcast Message Identifier */
-	SMS_SIM_EFILE_USIM_MBDN	= 0x6FC7, 		/** < USIM Mail Box Dialing Number */
- 	SMS_SIM_EFILE_SMS			= 0x6F3C,		/** < Short Messages file */
+	SMS_SIM_EFILE_USIM_MBDN	= 0x6FC7,		/** < USIM Mail Box Dialing Number */
+	SMS_SIM_EFILE_SMS			= 0x6F3C,		/** < Short Messages file */
 	SMS_SIM_EFILE_SMSP			= 0x6F42,		/** < SMS Parameter */
 	SMS_SIM_EFILE_SMSS			= 0x6F43,		/** < SMS Status */
 	SMS_SIM_EFILE_CBMI			= 0x6F45,		/** < Cell Broadcast Message Identifier */
@@ -493,12 +493,12 @@ enum _SMS_NETWORK_STATUS_E {
 
 
 /*==================================================================================================
-                                         STRUCTURES
+										STRUCTURES
 ==================================================================================================*/
 typedef struct _SMS_ADDRESS_S {
-	SMS_TON_T 		ton;
-	SMS_NPI_T 		npi;
-	char 				address[MAX_ADDRESS_LEN+1];        /* < null terminated string */
+	SMS_TON_T		ton;
+	SMS_NPI_T		npi;
+	char				address[MAX_ADDRESS_LEN+1];        /* < null terminated string */
 } SMS_ADDRESS_S;
 
 
@@ -533,8 +533,8 @@ typedef struct _SMS_TIMESTAMP_S {
 	SMS_TIME_FORMAT_T format;
 
 	union {
-		SMS_TIME_REL_S 	relative;
-		SMS_TIME_ABS_S 	absolute;
+		SMS_TIME_REL_S	relative;
+		SMS_TIME_ABS_S	absolute;
 	} time;
 } SMS_TIMESTAMP_S;
 
@@ -580,7 +580,7 @@ typedef struct _SMS_UDH_S {
 		SMS_CONCAT_16BIT_S			concat16bit;
 		SMS_APP_PORT_8BIT_S		appPort8bit;
 		SMS_APP_PORT_16BIT_S		appPort16bit;
-		SMS_SPECIAL_INDICATION_S 	specialInd;
+		SMS_SPECIAL_INDICATION_S	specialInd;
 		MSG_SINGLE_SHIFT_S			singleShift;
 		MSG_LOCKING_SHIFT_S			lockingShift;
 		SMS_ADDRESS_S				alternateAddress;
@@ -591,14 +591,14 @@ typedef struct _SMS_UDH_S {
 typedef struct _SMS_USERDATA_S {
 	int			headerCnt;
 	SMS_UDH_S	header[MAX_UD_HEADER_NUM];
-	int 			length;
-	char 			data[MAX_USER_DATA_LEN+1];
+	int			length;
+	char			data[MAX_USER_DATA_LEN+1];
 } SMS_USERDATA_S;
 
 
 typedef struct _SMS_TPUD_S {
 	int		udl;
-	char 		ud[MAX_USER_DATA_LEN+1];
+	char		ud[MAX_USER_DATA_LEN+1];
 } SMS_TPUD_S;
 
 
@@ -607,7 +607,7 @@ typedef struct _SMS_SUBMIT_S {
 	bool				bStatusReport;
 	bool				bHeaderInd;
 	bool				bReplyPath;
-	unsigned char 		msgRef;
+	unsigned char		msgRef;
 	SMS_VPF_T		vpf;
 	SMS_ADDRESS_S	destAddress;
 	SMS_PID_T		pid;
@@ -617,8 +617,7 @@ typedef struct _SMS_SUBMIT_S {
 } SMS_SUBMIT_S;
 
 
-typedef struct _SMS_SUBMIT_DATA_S
-{
+typedef struct _SMS_SUBMIT_DATA_S {
 	SMS_ADDRESS_S	destAddress;
 	unsigned int		segCount;
 	SMS_USERDATA_S	userData[MAX_SEGMENT_NUM];
@@ -631,7 +630,7 @@ typedef struct _SMS_DELIVER_S {
 	bool				bHeaderInd;
 	bool				bReplyPath;
 	SMS_ADDRESS_S	originAddress;
-	SMS_PID_T 	 	pid;
+	SMS_PID_T		pid;
 	SMS_DCS_S		dcs;
 	SMS_TIMESTAMP_S	timeStamp;
 	SMS_USERDATA_S	userData;
@@ -643,8 +642,8 @@ typedef struct _SMS_DELIVER_REPORT_S {
 	SMS_REPORT_TYPE_T	reportType;
 	bool					bHeaderInd;
 	SMS_FAIL_CAUSE_T		failCause;
-	unsigned char 			paramInd;
-	SMS_PID_T 	 		pid;
+	unsigned char			paramInd;
+	SMS_PID_T			pid;
 	SMS_DCS_S			dcs;
 	SMS_USERDATA_S		userData;
 } SMS_DELIVER_REPORT_S;
@@ -654,13 +653,13 @@ typedef struct _SMS_STATUS_REPORT_S {
 	bool				bMoreMsg;
 	bool				bStatusReport;
 	bool				bHeaderInd;
-	unsigned char 		msgRef;
+	unsigned char		msgRef;
 	SMS_ADDRESS_S	recipAddress;
 	SMS_TIMESTAMP_S	timeStamp;
 	SMS_TIMESTAMP_S	dischargeTime;
 	SMS_STATUS_T	status;
-	unsigned char 		paramInd;
-	SMS_PID_T 	 	pid;
+	unsigned char		paramInd;
+	SMS_PID_T		pid;
 	SMS_DCS_S		dcs;
 	SMS_USERDATA_S	userData;
 } SMS_STATUS_REPORT_S;
@@ -692,9 +691,9 @@ typedef struct _SMS_SENT_INFO_S {
 
 
 typedef struct _SMS_PUSH_APP_INFO_S {
-	char* 				pContentType;
-	char* 				pAppId;
-	SMS_WAP_APP_CODE_T 	appCode;
+	char*				pContentType;
+	char*				pAppId;
+	SMS_WAP_APP_CODE_T	appCode;
 } SMS_PUSH_APP_INFO_S;
 
 
@@ -709,11 +708,11 @@ typedef struct _SMS_CBMSG_DCS_S {
 	SMS_CBMSG_CODING_GROUP_T		codingGroup;		/**< Coding group, GSM 03.38 */
 	SMS_MSG_CLASS_T					classType;		/**< The message class */
 	bool								bCompressed;		/**< if text is compressed this is TRUE */
-	SMS_CODING_SCHEME_T			codingScheme;	/**< How to encode a message. */
-	SMS_CBMSG_LANG_TYPE_T   			langType;
-	unsigned char              				iso639Lang[3]; 	/* 2 GSM chars and a CR char */
+	SMS_CODING_SCHEME_T				codingScheme;	/**< How to encode a message. */
+	SMS_CBMSG_LANG_TYPE_T			langType;
+	unsigned char						iso639Lang[3];	/* 2 GSM chars and a CR char */
 	bool								bUDH;
-	unsigned char                       			rawData;
+	unsigned char						rawData;
 } SMS_CBMSG_DCS_S;
 
 
@@ -730,7 +729,7 @@ typedef struct _SMS_CBMSG_HEADER_S {
 
 typedef struct _SMS_CBMSG_PAGE_S {
 	SMS_CBMSG_TYPE_T			cbMsgType;							/*CBS Msg or SCHEDULE Msg or CBS41 Msg */
-	SMS_CBMSG_HEADER_S		 	pageHeader;							/**< CB Message Header */
+	SMS_CBMSG_HEADER_S			pageHeader;							/**< CB Message Header */
 	int							pageLength;							/**< message string length */
 	char							pageData[MAX_CBMSG_PAGE_SIZE*8/7+1];		/**< user data */
 } SMS_CBMSG_PAGE_S;
@@ -752,7 +751,7 @@ typedef struct _SMS_ETWS_PRIMARY_S {
 	unsigned short				msgId;
 	unsigned short				warningType;
 	unsigned char				warningSecurityInfo[MAX_ETWS_SIZE-6];
-}SMS_ETWS_PRIMARY_S;
+} SMS_ETWS_PRIMARY_S;
 
 
 typedef struct _SMS_WSP_CONTENTS_TYPE_S {
@@ -794,7 +793,7 @@ typedef struct _SMS_WSP_METHOD_TYPE_S {
 typedef struct _SMS_WSP_SECURITY_TYPE_S {
 	char*         SecurityTypeName;
 	unsigned char SecurityTypeCode;
-}SMS_WSP_SECURITY_TYPE_S;
+} SMS_WSP_SECURITY_TYPE_S;
 
 
 /**
@@ -804,7 +803,7 @@ typedef struct {
 	unsigned int	totalCount;			/**< The total number of SIM */
 	int			usedCount;			/**< The used number of SIM */
 	int			indexList[MAX_SIM_SMS_NUM];	/**< The SIM index list */
-}MSG_SIM_COUNT_S;
+} MSG_SIM_COUNT_S;
 
 
 /**
@@ -821,17 +820,17 @@ typedef struct {
  *	@brief	Represents Sim Mailbox information
  */
 typedef struct {
-	int 			b_cphs;
-	int 			rec_index; 								/**< index which stands for the location where record is saved in SIM*/
-	int 			profile_num; 							/**< SIM profile index*/
-	SMS_SIM_MAILBOX_TYPE_T 	mb_type;
-	int 			alpha_id_max_len; 						/**< alpha max length in SIM - READ ONLY*/
-	char 			alpha_id[MAX_SIM_XDN_ALPHA_ID_LEN + 1]; /**< Alpha Identifier */
-	MSG_SMS_TON_T 	ton; 									/**< Type Of Number */
-	MSG_SMS_NPI_T 	npi; 									/**< Number Plan Identity */
-	char 			num[MAX_PHONE_NUMBER_LEN + 1]; 			/**< Dialing Number/SSC String */
-	unsigned char 	cc_id; 									/**< Capability/Configuration Identifier */
-	unsigned char 	ext1_id; 								/**< Extensiion1 Record Identifier */
+	int			b_cphs;
+	int			rec_index;								/**< index which stands for the location where record is saved in SIM*/
+	int			profile_num;							/**< SIM profile index*/
+	SMS_SIM_MAILBOX_TYPE_T	mb_type;
+	int			alpha_id_max_len;						/**< alpha max length in SIM - READ ONLY*/
+	char			alpha_id[MAX_SIM_XDN_ALPHA_ID_LEN + 1]; /**< Alpha Identifier */
+	MSG_SMS_TON_T	ton;									/**< Type Of Number */
+	MSG_SMS_NPI_T	npi;									/**< Number Plan Identity */
+	char			num[MAX_PHONE_NUMBER_LEN + 1];			/**< Dialing Number/SSC String */
+	unsigned char	cc_id;									/**< Capability/Configuration Identifier */
+	unsigned char	ext1_id;								/**< Extensiion1 Record Identifier */
 	int				num_len;									/**< Length of the original number read from SIM*/
 } SMS_SIM_MAILBOX_INFO_S;
 
@@ -849,13 +848,13 @@ typedef struct {
  *	@brief	Represents Message Waiting Indication
  */
 typedef struct {
-	int 			rec_index;
-	unsigned char 	indicator_status; 	/**< Indicator Type*/
-	int 			voice_count; 		/**< VoiceMail Count*/
-	int 			fax_count; 			/**< FAX Count*/
-	int 			email_count; 		/**< Email Count*/
-	int			 	other_count; 		/**< Other Count*/
-	int 			video_count; 		/**< VideoMail Count*/
+	int			rec_index;
+	unsigned char	indicator_status;	/**< Indicator Type*/
+	int			voice_count;		/**< VoiceMail Count*/
+	int			fax_count;			/**< FAX Count*/
+	int			email_count;		/**< Email Count*/
+	int				other_count;		/**< Other Count*/
+	int			video_count;		/**< VideoMail Count*/
 } SMS_SIM_MWI_NORMAL_INFO_S;
 
 
@@ -892,8 +891,8 @@ typedef struct {
  *	@brief	Represents SIM MSISDN Information
  */
 typedef struct {
-	char 	simMsisdn[MAX_SIM_MSISDN_LEN + 1];
-	int 	sim_index;
+	char	simMsisdn[MAX_SIM_MSISDN_LEN + 1];
+	int	sim_index;
 } SMS_SIM_MSISDN_INFO_S;
 
 
diff --git a/plugin/sms_plugin/include/SmsPluginUAManager.h b/plugin/sms_plugin/include/SmsPluginUAManager.h
index 9585c3f..4c2c86a 100755
--- a/plugin/sms_plugin/include/SmsPluginUAManager.h
+++ b/plugin/sms_plugin/include/SmsPluginUAManager.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+											INCLUDE FILES
 ==================================================================================================*/
 #include "MsgMutex.h"
 #include "MsgQueue.h"
@@ -28,7 +28,7 @@
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+											CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginUAManager : public MsgThread
 {
@@ -42,10 +42,10 @@ public:
 private:
 	SmsPluginUAManager();
 	~SmsPluginUAManager();
-	void lock() 	{ mx.lock(); };
-	void unlock() 	{ mx.unlock(); };
-	void wait() 	{ cv.wait(mx.pMsgMutex()); };
-	void signal() 	{ cv.signal(); };
+	void lock()	{ mx.lock(); };
+	void unlock()	{ mx.unlock(); };
+	void wait()	{ cv.wait(mx.pMsgMutex()); };
+	void signal()	{ cv.signal(); };
 
 	virtual void run();
 
diff --git a/plugin/sms_plugin/include/SmsPluginUDCodec.h b/plugin/sms_plugin/include/SmsPluginUDCodec.h
index ade94f9..7185ac8 100755
--- a/plugin/sms_plugin/include/SmsPluginUDCodec.h
+++ b/plugin/sms_plugin/include/SmsPluginUDCodec.h
@@ -19,13 +19,13 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include "SmsPluginTypes.h"
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginUDCodec
 {
diff --git a/plugin/sms_plugin/include/SmsPluginWapPushHandler.h b/plugin/sms_plugin/include/SmsPluginWapPushHandler.h
index c46f6e8..1ab4316 100755
--- a/plugin/sms_plugin/include/SmsPluginWapPushHandler.h
+++ b/plugin/sms_plugin/include/SmsPluginWapPushHandler.h
@@ -19,7 +19,7 @@
 
 
 /*==================================================================================================
-                                         INCLUDE FILES
+										INCLUDE FILES
 ==================================================================================================*/
 #include <wbxml/wbxml.h>
 #include <libxml/parser.h>
@@ -29,21 +29,21 @@
 
 
 /*==================================================================================================
-                                         DEFINES
+										DEFINES
 ==================================================================================================*/
-#define WSP_STANDARD_STR_LEN_MAX        255
-#define LENGTH_QUOTE  0x1F
-#define	NO_VALUE						0x00
+#define WSP_STANDARD_STR_LEN_MAX		255
+#define LENGTH_QUOTE						0x1F
+#define NO_VALUE						0x00
 
 #define WSP_CODE_BUFFER_LEFT_LEN_MAX	1024
 #define WSP_CODE_BUFFER_RIGHT_LEN_MAX	2048
 
-#define  AcStrlen(x) ((x == NULL)?0:strlen(x))
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+#define AcStrlen(x) ((x == NULL) ? 0 : strlen(x))
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
 
 
 /*==================================================================================================
-                                     CLASS DEFINITIONS
+										CLASS DEFINITIONS
 ==================================================================================================*/
 class SmsPluginWapPushHandler
 {
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 /plugin
parent	700dd2ec843a593833031fcd9403492feee76271 (diff)
download	msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.tar.gz msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.tar.bz2 msg-service-d58a3bf5a8121b1294457db7b4a7616207665519.zip