Apply tizen coding rule 12/53712/1 accepted/tizen/mobile/20151209.131509 accepted/tizen/tv/20151209.131524 accepted/tizen/wearable/20151209.131552 submit/tizen/20151209.021036
authorSangkoo Kim <sangkoo.kim@samsung.com>
Wed, 9 Dec 2015 02:02:10 +0000 (11:02 +0900)
committerSangkoo Kim <sangkoo.kim@samsung.com>
Wed, 9 Dec 2015 02:02:10 +0000 (11:02 +0900)
Change-Id: I915288b543a007e635b6d253a8b382c03bb01207

vobject-engine/VCard.c
vobject-engine/VCardCalUtil.c
vobject-engine/VMessage.c

index f57dcf0..3e1b026 100755 (executable)
 #define CHECK_START 1
 #define CHECK_END 2
 
-#define VFREE(obj) if(obj != NULL) { /*VDATA_TRACE("%p",obj);*/ free(obj); \
+#define VFREE(obj) if (obj != NULL) { /*VDATA_TRACE("%p",obj);*/ free(obj); \
        obj = NULL; \
 }
 
-#define TRIM(obj) if(obj != NULL) {\
+#define TRIM(obj) if (obj != NULL) {\
        _VRLSpace(obj);\
        _VRTSpace(obj);\
 }
 
-#define UPPER(obj,start,end) if(obj != NULL) {\
-       for(start = 0; start < end; start++)\
+#define UPPER(obj, start, end) if (obj != NULL) {\
+       for (start = 0; start < end; start++)\
                obj[start] = toupper(obj[start]);\
 }
 
 #define SET_PARAM_VALUE(PARAM, SZVALUE, LIST, LISTCNT, PARAMOBJ, PTYPE, ENC) {\
        PARAM = 0;\
        PARAM |= __VCardGetValue(SZVALUE, LIST, LISTCNT);\
-       if ( PARAM != UNKNOWN_NAME ) {\
+       if (PARAM != UNKNOWN_NAME) {\
                PARAMOBJ->parameter = PTYPE;\
-               if(PTYPE == VCARD_PARAM_ENCODING)\
+               if (PTYPE == VCARD_PARAM_ENCODING)\
                        ENC = PARAM;\
                break;\
-       }\
+       } \
 }
 
-#define LENGTH_TYPE_LIST(obj, len) for(len =0; obj[len] != NULL; len++);
+#define LENGTH_TYPE_LIST(obj, len) for (len = 0; obj[len] != NULL; len++);
 
-extern char* _VUnfoldingNoSpecNew( char *string );
+extern char* _VUnfoldingNoSpecNew(char *string);
 
 /** GLOBAL VARIABLE DECLARATION AND INITIALIZATION */
 /** vCard Types. */
-char* pszCardTypeList[] =
-{
+char* pszCardTypeList[] = {
        "ADR",                  /* Delivery Address -> address*/
        "AGENT",                        /* Agent -> assistant name, assistant number*/
        "BDAY",                 /* Birthday -> birthday */
@@ -100,8 +99,7 @@ char* pszCardTypeList[] =
 };
 
 /** Parameter */
-char* pszCardParamList[] =
-{
+char* pszCardParamList[] = {
        "CHARSET",
        "CONTEXT",
        "ENCODING",
@@ -111,8 +109,7 @@ char* pszCardParamList[] =
 };
 
 /** Encoding value */
-ValueObj pEncList[] =
-{
+ValueObj pEncList[] = {
        {"B",                   0x00000001},
        {"BASE64",      0x00000002},
        {"QUOTED-PRINTABLE", 0x00000004},
@@ -121,16 +118,14 @@ ValueObj pEncList[] =
 };
 
 /** Character set value */
-ValueObj pCharsetList[] =
-{
+ValueObj pCharsetList[] = {
        {"UTF-8",                       0x00000001},
        {"UTF-16",              0x00000002},
        {"ISO-8859-1",  0x00000004}
 };
 
 /** Value value */
-ValueObj pValueList[] =
-{
+ValueObj pValueList[] = {
        {"BINARY",                      0x00000001},
        {"BOOLEAN",                     0x00000002},
        {"DATE",                                0x00000004},
@@ -147,8 +142,7 @@ ValueObj pValueList[] =
 };
 
 /** Type value */
-ValueObj pTypeList[] =
-{
+ValueObj pTypeList[] = {
        {"AIFF",                0x00000001},
        {"BBS",                 0x00000002},
        {"CAR",                 0x00000004},
@@ -186,7 +180,7 @@ int __VCardGetValue(char*, const ValueObj*, int);
 int __VCardGetTypeName(char*, int*, int*);
 int __VCardGetParamName(char*, int*, int*);
 int __VIsVcardFile(char*, int);
-char* __VCardGetParamVal(char*,int*, int*);
+char* __VCardGetParamVal(char*, int*, int*);
 char* __VCardGetTypeVal(char*, int*, int*, int, VObject*);
 char* __VCardTypeEncode(VObject*, char*);
 char* __VCardParamEncode(VObject*, int*);
@@ -214,9 +208,9 @@ __VCardGetName(char* szString, char* pszList[], int size)
        low = 0;
        high = size - 1;
 
-       for(; high >= low; diff<0 ? (low = i+1):(high = i-1)) {
-               i = ( low + high ) / 2;
-               if((diff = strcmp( pszList[i], szString )) == 0) /* success: found it */
+       for (; high >= low; diff < 0 ? (low = i+1) : (high = i-1)) {
+               i = (low + high) / 2;
+               if ((diff = strcmp(pszList[i], szString)) == 0) /* success: found it */
                        return i;
        }
        VDATA_TRACE_END
@@ -233,7 +227,7 @@ __VCardGetName(char* szString, char* pszList[], int size)
  * @return     flag      The value's flag.
  */
 int
-__VCardGetValue( char* szString, const ValueObj list[], int size)
+__VCardGetValue(char* szString, const ValueObj list[], int size)
 {
        VDATA_TRACE_BEGINE
        int i = 0, diff = -1;
@@ -242,25 +236,22 @@ __VCardGetValue( char* szString, const ValueObj list[], int size)
        SysRequireEx(szString, UNKNOWN_NAME);
        SysRequireEx(size > 0, UNKNOWN_NAME);
 
-       UPPER(szTemp,i,strlen(szTemp));
-
-       for(i = 0; i < size-1; i++)
-       {
-               VDATA_TRACE(" i : %d",i);
-               VDATA_TRACE(" for loop %d < %d, list[%d] : %p, list[%d].szName : %p",i,size,i,list[i],i,list[i].szName);
-               VDATA_TRACE(" i : %d",i);
-               if(list[i].szName != NULL)
-               {
-                       VDATA_TRACE(" list[%d].szName != NULL",i);
-                       VDATA_TRACE(" before strcmp %s %s",list[i].szName,szTemp);
-                       VDATA_TRACE(" before strcmp %d",strcmp(list[i].szName, szTemp));
-                       if((diff = strcmp(list[i].szName, szTemp)) == 0) /* success: found it */
-                       {
-                               VDATA_TRACE(" return %d",list[i].flag);
+       UPPER(szTemp, i, strlen(szTemp));
+
+       for (i = 0; i < size-1; i++) {
+               VDATA_TRACE(" i : %d", i);
+               VDATA_TRACE(" for loop %d < %d, list[%d] : %p, list[%d].szName : %p", i, size, i, list[i], i, list[i].szName);
+               VDATA_TRACE(" i : %d", i);
+               if (list[i].szName != NULL) {
+                       VDATA_TRACE(" list[%d].szName != NULL", i);
+                       VDATA_TRACE(" before strcmp %s %s", list[i].szName, szTemp);
+                       VDATA_TRACE(" before strcmp %d", strcmp(list[i].szName, szTemp));
+                       if ((diff = strcmp(list[i].szName, szTemp)) == 0) { /* success: found it */
+                               VDATA_TRACE(" return %d", list[i].flag);
                                VDATA_TRACE_END
                                return list[i].flag;
                        }
-                       VDATA_TRACE(" after strcmp %s %s",list[i].szName,szTemp);
+                       VDATA_TRACE(" after strcmp %s %s", list[i].szName, szTemp);
                }
        }
        VDATA_TRACE(" return UNKNOWN_NAME");
@@ -283,7 +274,7 @@ __VCardGetTypeName(char* pVCardRaw, int* pStatus, int* pDLen)
        VDATA_TRACE_BEGINE
        int     i, index, res;
        char    c;
-       char    name[MAX_TYPE_NAME_LEN+1]={0,};
+       char    name[MAX_TYPE_NAME_LEN+1] = {0,};
 
 #ifdef VDATA_GROUPNAME_SUPPORTED
        char*   szGroupName = NULL;
@@ -294,7 +285,7 @@ __VCardGetTypeName(char* pVCardRaw, int* pStatus, int* pDLen)
        i = index = 0;
        res = UNKNOWN_NAME;
 
-       while(true) {
+       while (true) {
 
                GO_NEXT_CHAR(c, pVCardRaw, pDLen);
 
@@ -303,7 +294,7 @@ __VCardGetTypeName(char* pVCardRaw, int* pStatus, int* pDLen)
                 * If TYPE NAME's value is over MAX_TYPE_NAME_LEN, return UNKNOWN_NAME.
                 * And then Decoding Step shoud not be changed.
                 */
-               if(index >= MAX_TYPE_NAME_LEN) {
+               if (index >= MAX_TYPE_NAME_LEN) {
                        *pStatus = VCARD_TYPE_NAME_STATUS;
                        res = UNKNOWN_NAME;
                        break;
@@ -314,20 +305,20 @@ __VCardGetTypeName(char* pVCardRaw, int* pStatus, int* pDLen)
                 * If VTYPE_TOKEN_SEMICOLON or VTYPE_TOKEN_COLON is faced with,
                 * find TYPE NAME's value in pszCardTypeList, and then return searched result.
                 */
-               if ((c == VTYPE_TOKEN_SEMICOLON ) || ( c == VTYPE_TOKEN_COLON)) {
+               if ((c == VTYPE_TOKEN_SEMICOLON) || (c == VTYPE_TOKEN_COLON)) {
                        name[index] = 0x00;
                        TRIM(name);
-                       UPPER(name,i,index);
-                       res = __VCardGetName( name, (char**)pszCardTypeList, VCARD_TYPE_NUM );
+                       UPPER(name, i, index);
+                       res = __VCardGetName(name, (char**)pszCardTypeList, VCARD_TYPE_NUM);
                        break;
                }
                /** current version not support grouping vcard type */
-               else if ( c == VTYPE_TOKEN_DOT ) {
+               else if (c == VTYPE_TOKEN_DOT) {
 #ifdef VDATA_GROUPNAME_SUPPORTED
                        name[index] = '\0';
-                       szGroupName = ( char* ) calloc(1,  index+1 );
-                       if(szGroupName != NULL){
-                               strncpy( szGroupName, name, index );
+                       szGroupName = (char*) calloc(1,  index+1);
+                       if (szGroupName != NULL) {
+                               strncpy(szGroupName, name, index);
                                gszGroupName = szGroupName;
                        }
                        index = 0;
@@ -337,28 +328,27 @@ __VCardGetTypeName(char* pVCardRaw, int* pStatus, int* pDLen)
                 * There is no new line in TYPE NAME.
                 * If new line character is faced with, return UNKNOWN_NAME;
                 */
-               else if ( ( c == '\r' ) || ( c == '\n' ) )
-               {
+               else if ((c == '\r') || (c == '\n')) {
                        (*pDLen)++;
                        *pStatus = VCARD_TYPE_NAME_STATUS;
                        res = UNKNOWN_NAME;
                        return res;
-               }
-               else if(_VIsSpace(c));
-               else    name[index++] = c;
+               } else if (_VIsSpace(c)) {
+               } else
+                       name[index++] = c;
        }
 
        /**
         *      Set Next Step.
         *
         */
-       if ( c == VTYPE_TOKEN_SEMICOLON )
+       if (c == VTYPE_TOKEN_SEMICOLON)
                /**
                 * This case next token is parameter. So set VCARD_PARAM_NAME_STATUS step.
                 */
                *pStatus = VCARD_PARAM_NAME_STATUS;
        else {
-               if(res != UNKNOWN_NAME)
+               if (res != UNKNOWN_NAME)
                        /**
                         * This case next string is value. So set VCARD_TYPE_VALUE_STATUS step.
                         */
@@ -383,22 +373,21 @@ __VCardGetTypeName(char* pVCardRaw, int* pStatus, int* pDLen)
  * @return     res                     The index in type list
  */
 int
-__VCardGetParamName( char* pVCardRaw, int* pStatus, int* pDLen )
+__VCardGetParamName(char* pVCardRaw, int* pStatus, int* pDLen)
 {
        VDATA_TRACE_BEGINE
        int     i, index, res;
 
        char    c;
-       char    name[MAX_PARAM_NAME_LEN+1]={0,};
+       char    name[MAX_PARAM_NAME_LEN+1] = {0,};
        char* pTemp = pVCardRaw;
 
-       SysRequireEx( pVCardRaw, UNKNOWN_NAME );
+       SysRequireEx(pVCardRaw, UNKNOWN_NAME);
 
        i = index = 0;
        res = UNKNOWN_NAME;
 
-       while ( true )
-       {
+       while (true) {
                GO_NEXT_CHAR(c, pVCardRaw, pDLen);
 
                /**
@@ -406,7 +395,7 @@ __VCardGetParamName( char* pVCardRaw, int* pStatus, int* pDLen )
                 * If PARAM NAME's value is over MAX_PARAM_NAME_LEN, return UNKNOWN_NAME.
                 * And then Decoding Step shoud not be changed.
                 */
-               if(index >= MAX_PARAM_NAME_LEN) {
+               if (index >= MAX_PARAM_NAME_LEN) {
                        *pStatus = VCARD_TYPE_NAME_STATUS;
                        res = UNKNOWN_NAME;
                        break;
@@ -417,12 +406,12 @@ __VCardGetParamName( char* pVCardRaw, int* pStatus, int* pDLen )
                 * If VTYPE_TOKEN_EQUAL is faced with,
                 * find PARAM NAME's value in pszCardParamList, and then return searched result.
                 */
-               if(c == VTYPE_TOKEN_EQUAL) {
+               if (c == VTYPE_TOKEN_EQUAL) {
                        name[index] = '\0';
                        TRIM(name);
                        UPPER(name, i, index);
-                       res = __VCardGetName( name, ( char** )pszCardParamList, VCARD_PARAM_NUM );
-                       if(res==UNKNOWN_NAME){
+                       res = __VCardGetName(name, (char**)pszCardParamList, VCARD_PARAM_NUM);
+                       if (res == UNKNOWN_NAME) {
                                (*pDLen) = 0;
                        }
                        *pStatus = VCARD_PARAM_VALUE_STATUS;
@@ -439,7 +428,7 @@ __VCardGetParamName( char* pVCardRaw, int* pStatus, int* pDLen )
                 * VCARD_PARAM_NAME_STATUS(current) -> VCARD_PARAM_VALUE_STATUS
                 * -> VCARD_TYPE_VALUE_STATUS -> MOVE TO NEXT TYPE
                 */
-               else if(c == VTYPE_TOKEN_COLON) {
+               else if (c == VTYPE_TOKEN_COLON) {
                        *pStatus = VCARD_PARAM_VALUE_STATUS;
                        pVCardRaw = pTemp;
                        (*pDLen) = 0;
@@ -457,15 +446,15 @@ __VCardGetParamName( char* pVCardRaw, int* pStatus, int* pDLen )
                 * VCARD_PARAM_NAME_STATUS(current) -> VCARD_PARAM_NAME_STATUS
                 * -> VCARD_PARAM_VALUE_STATUS -> VCARD_TYPE_VALUE_STATUS -> MOVE TO NEXT TYPE
                 */
-               else if(c == VTYPE_TOKEN_SEMICOLON) {
+               else if (c == VTYPE_TOKEN_SEMICOLON) {
                        *pStatus = VCARD_PARAM_NAME_STATUS;
                        pVCardRaw = pTemp;
                        (*pDLen) = 0;
                        res = UNKNOWN_NAME;
                        break;
-               }
-               else if((c == '\r') || (c == '\n') || (_VIsSpace(c)));
-               else
+               } else if ((c == '\r') || (c == '\n') || (_VIsSpace(c))) {
+
+               else
                        name[index++] = c;
        }
        VDATA_TRACE_END
@@ -488,45 +477,40 @@ __VCardFreeVTreeMemory(VTree * pTree)
        int count = 0;
        int i = 0;
 
-       SysRequireEx( pTree->treeType == VCARD, false );
-       SysRequireEx( pTree != NULL, false );
+       SysRequireEx(pTree->treeType == VCARD, false);
+       SysRequireEx(pTree != NULL, false);
        VDATA_TRACE("vcard_free_vtree_memory() entered.");
 
-       if (pTree->treeType != VCARD)
-       {
+       if (pTree->treeType != VCARD) {
                VDATA_TRACE_END
                return true;
        }
 
        pCurTree = pTree;
 
-       while(pCurTree)
-       {
+       while (pCurTree) {
                pNextTree = pCurTree->pNext;
                pCurObj = pCurTree->pTop;
 
-               while ( pCurObj )
-               {
+               while (pCurObj) {
 
                        pNextObj = pCurObj->pSibling;
                        count = pCurObj->valueCount;
 
-                       for ( i = 0; i < count; i++ ) {
-                               VFREE( pCurObj->pszValue[i]);
+                       for (i = 0; i < count; i++) {
+                               VFREE(pCurObj->pszValue[i]);
                        }
 
 #ifdef VDATA_GROUPNAME_SUPPORTED
-                       if ( pCurObj->pszGroupName )
-                               VFREE( pCurObj->pszGroupName );
+                       if (pCurObj->pszGroupName)
+                               VFREE(pCurObj->pszGroupName);
 #endif
 
-                       if ( pCurObj->pParam )
-                       {
+                       if (pCurObj->pParam) {
 
                                pCurParam = pCurObj->pParam;
 
-                               while(pCurParam != NULL)
-                               {
+                               while (pCurParam != NULL) {
                                        pNextParam = pCurParam->pNext;
                                        VDATA_TRACE("pNEXT ==> %p", pCurParam->pNext);
                                        VDATA_TRACE("pPARAM ==> %p", pCurParam->parameter);
@@ -534,7 +518,7 @@ __VCardFreeVTreeMemory(VTree * pTree)
                                        VDATA_TRACE("pCurParam : %p", pCurParam);
                                        VDATA_TRACE("pCurParam->parameter : %d", pCurParam->parameter);
                                        VDATA_TRACE("pCurParam->paramValue : %d", pCurParam->paramValue);
-                                       if(pNextParam != NULL) {
+                                       if (pNextParam != NULL) {
                                                VDATA_TRACE("pNextParam : %p", pNextParam);
                                                VDATA_TRACE("pNextParam->parameter : %d", pNextParam->parameter);
                                                VDATA_TRACE("pNextParam->paramValue : %d", pNextParam->paramValue);
@@ -544,11 +528,11 @@ __VCardFreeVTreeMemory(VTree * pTree)
                                }
                        }
 
-                       VFREE( pCurObj );
+                       VFREE(pCurObj);
                        pCurObj = pNextObj;
                }
 
-               VFREE( pCurTree );
+               VFREE(pCurTree);
                pCurTree = pNextTree;
        }
 
@@ -567,7 +551,7 @@ __VCardFreeVTreeMemory(VTree * pTree)
  * @return     buffer          The result value
  */
 char*
-__VCardGetParamVal( char* pVCardRaw, int* pStatus, int* pDLen )
+__VCardGetParamVal(char* pVCardRaw, int* pStatus, int* pDLen)
 {
        VDATA_TRACE_BEGINE
        int len = 0;
@@ -575,34 +559,35 @@ __VCardGetParamVal( char* pVCardRaw, int* pStatus, int* pDLen )
        char* pBuf = NULL;
        char* pTemp = pVCardRaw;
 
-       SysRequireEx( pVCardRaw, NULL );
+       SysRequireEx(pVCardRaw, NULL);
 
-       while(true) {
+       while (true) {
                GO_NEXT_CHAR(c, pVCardRaw, pDLen);
                len++;
-               switch(c) {
-                       case VTYPE_TOKEN_SEMICOLON :
+               switch (c) {
+                       case VTYPE_TOKEN_SEMICOLON:
                                *pStatus = VCARD_PARAM_NAME_STATUS;
                                break;
-                       case VTYPE_TOKEN_COLON :
+                       case VTYPE_TOKEN_COLON:
                                *pStatus = VCARD_TYPE_VALUE_STATUS;
                                break;
-                       case VTYPE_TOKEN_COMMA :
+                       case VTYPE_TOKEN_COMMA:
                                *pStatus = VCARD_PARAM_VALUE_STATUS;
                                break;
                }
-               ifc == VTYPE_TOKEN_SEMICOLON
+               if (c == VTYPE_TOKEN_SEMICOLON
                                || c == VTYPE_TOKEN_COLON
                                || c == VTYPE_TOKEN_COMMA
                                || c == 0x00)
                        break;
        }
 
-       //if (len < 1)
-               //return NULL;
+       /* if (len < 1)
+               return NULL;
+       */
 
        pBuf = (char *)calloc(1, len);
-       if(pBuf  == NULL)
+       if (pBuf  == NULL)
                return NULL;
 
        memset(pBuf, 0x00, len);
@@ -621,7 +606,7 @@ __VCardGetParamVal( char* pVCardRaw, int* pStatus, int* pDLen )
  * @return     buffer          The result value
  */
 char*
-__VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject* pType)
+__VCardGetTypeVal(char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject* pType)
 {
        VDATA_TRACE_BEGINE
        int num = 0;
@@ -637,23 +622,22 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
        int Status = 0;
        int Len = 0;
 
-       SysRequireEx( pVCardRaw, NULL );
+       SysRequireEx(pVCardRaw, NULL);
 
-       while(true)
-       {
+       while (true) {
                GO_NEXT_CHAR(c, pVCardRaw, pDLen);
 
-               ifc == 0x00) break;
+               if (c == 0x00) break;
 
                len++;
 
                /** This case means that there are more type's value. */
-               if ( c == VTYPE_TOKEN_SEMICOLON && bEscape == false ) {
+               if (c == VTYPE_TOKEN_SEMICOLON && bEscape == false) {
 
-                       if((pBuf = (char *)calloc(1, len)) == NULL) return NULL;
+                       if ((pBuf = (char *)calloc(1, len)) == NULL) return NULL;
 
                        memset(pBuf, 0x00, len);
-                       memcpy(pBuf,pTemp,len-1);
+                       memcpy(pBuf, pTemp, len-1);
 
                        TRIM(pBuf);
                        _VUnescape(pBuf);
@@ -661,11 +645,11 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
                        *pStatus = VCARD_TYPE_VALUE_STATUS;
 
                        /** Base 64 Decoding */
-                       if((enc & pEncList[1].flag) || (enc & pEncList[0].flag)) {
+                       if ((enc & pEncList[1].flag) || (enc & pEncList[0].flag)) {
 
                                bufferCount = (len * 6 / 8) + 2;
 
-                               if((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL) {
+                               if ((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL) {
                                        VFREE(pBuf);
                                        return NULL;
                                }
@@ -673,7 +657,7 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
                                memset(pTmpBuf, 0x00, bufferCount);
                                num = _VB64Decode(pTmpBuf, pBuf);
 
-                               if(pType != NULL) pType->numOfBiData = num;
+                               if (pType != NULL) pType->numOfBiData = num;
 
                                VFREE(pBuf);
                                pBuf = pTmpBuf;
@@ -682,19 +666,18 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
                        }
 
                        /** Quoted Printable Decoding */
-                       if(enc & pEncList[2].flag) {
+                       if (enc & pEncList[2].flag) {
 
                                int i = 0, j = 0;
 
-                               while(pBuf[i]) {
-                                       if(pBuf[i] == '\n' || pBuf[i] == '\r'){
+                               while (pBuf[i]) {
+                                       if (pBuf[i] == '\n' || pBuf[i] == '\r') {
                                                i++;
-                                               if(pBuf[i] == '\n'|| pBuf[i] == '\r')
+                                               if (pBuf[i] == '\n' || pBuf[i] == '\r')
                                                        i++;
 
-                                               if(pBuf[j-1] == '=') j--;
-                                       }
-                                       else
+                                               if (pBuf[j-1] == '=') j--;
+                                       } else
                                                pBuf[j++] = pBuf[i++];
                                }
                                pBuf[j] = '\0';
@@ -706,31 +689,26 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
                        break;
                }
 
-               if(c == '\\')
+               if (c == '\\')
                        bEscape = true;
-               else if(bEscape == true && c != VTYPE_TOKEN_SEMICOLON )
+               else if (bEscape == true && c != VTYPE_TOKEN_SEMICOLON)
                        bEscape = false;
-               else if((c == '\r') || (c == '\n'))
-               {
+               else if ((c == '\r') || (c == '\n')) {
                        c2 = *(pVCardRaw-2);
 
-                       if(c2 == '=' && (enc & pEncList[2].flag))
-                       {
+                       if (c2 == '=' && (enc & pEncList[2].flag)) {
                                c1 = *pVCardRaw;
-                               if((c1 == '\r') || (c1 == '\n'))
-                               {
+                               if ((c1 == '\r') || (c1 == '\n')) {
                                        pVCardRaw += 1;
                                        (*pDLen) += 1;
                                        len++;
                                }
-                       }
-                       else if(__VCardGetTypeName(pVCardRaw, &Status, &Len) != UNKNOWN_NAME)
-                       {
+                       } else if (__VCardGetTypeName(pVCardRaw, &Status, &Len) != UNKNOWN_NAME) {
                                --len;
-                               if((pBuf = (char *)calloc(1, len)) == NULL) return NULL;
+                               if ((pBuf = (char *)calloc(1, len)) == NULL) return NULL;
 
                                memset(pBuf, 0x00, len);
-                               memcpy(pBuf,pTemp,len-1);
+                               memcpy(pBuf, pTemp, len-1);
 
                                TRIM(pBuf);
                                _VUnescape(pBuf);
@@ -739,16 +717,16 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
 
                                c1 = *pVCardRaw;
 
-                               if((c1 == '\r') || (c1 == '\n')) {
+                               if ((c1 == '\r') || (c1 == '\n')) {
                                        pVCardRaw += 1;
                                        (*pDLen) += 1;
                                }
 
-                               if((enc & pEncList[1].flag) || (enc & pEncList[0].flag)) {
+                               if ((enc & pEncList[1].flag) || (enc & pEncList[0].flag)) {
 
                                        bufferCount = (len * 6 / 8) + 5;
 
-                                       if((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL) {
+                                       if ((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL) {
                                                VFREE(pBuf);
                                                return NULL;
                                        }
@@ -756,7 +734,7 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
                                        memset(pTmpBuf, 0x00, bufferCount);
                                        num = _VB64Decode(pTmpBuf, pBuf);
 
-                                       if(pType != NULL)
+                                       if (pType != NULL)
                                                pType->numOfBiData = num;
 
                                        VFREE(pBuf);
@@ -765,21 +743,18 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
                                        break;
                                }
 
-                               if(enc & pEncList[2].flag) {
+                               if (enc & pEncList[2].flag) {
 
                                        int i = 0, j = 0;
 
-                                       while(pBuf[i])
-                                       {
-                                               if(pBuf[i] == '\n' || pBuf[i] == '\r')
-                                               {
+                                       while (pBuf[i]) {
+                                               if (pBuf[i] == '\n' || pBuf[i] == '\r') {
                                                        i++;
-                                                       if(pBuf[i] == '\n' || pBuf[i] == '\r')
+                                                       if (pBuf[i] == '\n' || pBuf[i] == '\r')
                                                                i++;
 
-                                                       if(pBuf[j-1] == '=') j--;
-                                               }
-                                               else
+                                                       if (pBuf[j-1] == '=') j--;
+                                               } else
                                                        pBuf[j++] = pBuf[i++];
                                        }
                                        pBuf[j] = '\0';
@@ -798,7 +773,7 @@ __VCardGetTypeVal( char* pVCardRaw, int* pStatus, int* pDLen, int enc, VObject*
 
 
 int
-VCardGetTypeValue( int index )
+VCardGetTypeValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VCardGetTypeValue() enter..\n");
@@ -807,7 +782,7 @@ VCardGetTypeValue( int index )
 }
 
 int
-VCardGetValValue( int index )
+VCardGetValValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VCardGetValValue() enter..\n");
@@ -816,7 +791,7 @@ VCardGetValValue( int index )
 }
 
 int
-VCardGetEncValue( int index )
+VCardGetEncValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VCardGetEncValue() enter..\n");
@@ -825,7 +800,7 @@ VCardGetEncValue( int index )
 }
 
 int
-VCardGetCharsetValue( int index )
+VCardGetCharsetValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VCardGetCharsetValue() enter..\n");
@@ -840,7 +815,7 @@ VCardGetCharsetValue( int index )
  * @return      vObject             The result value
  */
 SLPAPI VTree*
-vcard_decode( char *pCardRaw )
+vcard_decode(char *pCardRaw)
 {
        VDATA_TRACE_BEGINE;
        char* szValue = NULL;
@@ -875,47 +850,45 @@ vcard_decode( char *pCardRaw )
                return NULL;
        }
        pCardRawTmp = pCardRaw;
-       len = _VManySpace2Space( pCardRaw );
+       len = _VManySpace2Space(pCardRaw);
 
        VDATA_TRACE("ret value of _VManySpace2Space = %d", len);
 
-       if(!__VIsVcardFile(pCardRaw, CHECK_START)) {
+       if (!__VIsVcardFile(pCardRaw, CHECK_START)) {
                VFREE(pCardRawTmp);
                VDATA_TRACE_END
                return NULL;
        }
 
 
-       while(true && !done)
-       {
+       while (true && !done) {
                c = *pCardRaw;
 
-               if((c == '\0') || done)
+               if ((c == '\0') || done)
                        break;
 
-               switch(status) {
+               switch (status) {
                        case VCARD_TYPE_NAME_STATUS:
                                dLen = 0;
                                type = __VCardGetTypeName(pCardRaw, &status, &dLen);
                                pCardRaw += dLen;
 
-                               if(type == -1)
+                               if (type == -1)
                                        break;
 
-                               switch ( type )
-                               {
+                               switch (type) {
                                        case VCARD_TYPE_BEGIN:
                                                if (pVCard) {
                                                        free(pVCard);
                                                        pVCard = NULL;
                                                }
 
-                                               if ( ( pVCard = ( VTree* )calloc(1,  sizeof( VTree ) ) ) == NULL ) {
+                                               if ((pVCard = (VTree*)calloc(1,  sizeof(VTree))) == NULL) {
                                                        //start_status = 1;
                                                        goto CATCH;
                                                }
 
-                                               memset(pVCard,0x00, sizeof(VTree));
+                                               memset(pVCard, 0x00, sizeof(VTree));
 
                                                dLen = 0;
                                                szCardBegin = __VCardGetTypeVal(pCardRaw, &status, &dLen, enc, NULL);
@@ -930,39 +903,37 @@ vcard_decode( char *pCardRaw )
 
                                        case VCARD_TYPE_END:
                                                enc = 0;
-                                               if(strstr(pCardRaw,"VCARD") != NULL) {
+                                               if (strstr(pCardRaw, "VCARD") != NULL) {
                                                        pCardRaw += dLen;
                                                        done = true;
-                                               vcard_ended = true;
-                                               }
-                                               else    {
+                                                       vcard_ended = true;
+                                               } else  {
                                                        status = VCARD_TYPE_NAME_STATUS;
                                                        pCardRaw += dLen;
-                                                       //VFREE(etemp);
+                                                       /*VFREE(etemp); */
                                                }
                                                break;
 
-                                       case UNKNOWN_NAME :
+                                       case UNKNOWN_NAME:
                                                break;
 
                                        default:
-                                               if(UNKNOWN_NAME == type || type < 0) {
+                                               if (UNKNOWN_NAME == type || type < 0) {
                                                        status = VCARD_TYPE_NAME_STATUS;
                                                        break;
                                                }
 
-                                               if ( ( pTemp = ( VObject* )calloc(1,  sizeof( VObject ) ) ) == NULL ) {
+                                               if ((pTemp = (VObject*)calloc(1,  sizeof(VObject))) == NULL) {
                                                        goto CATCH;
                                                }
 
-                                               memset( pTemp, 0, sizeof( VObject ) );
+                                               memset(pTemp, 0, sizeof(VObject));
                                                pTemp->property = type;
 
-                                               if ( pVCard->pTop == NULL ) {
+                                               if (pVCard->pTop == NULL) {
                                                        pVCard->pTop = pTemp;
                                                        pVCard->pCur = pTemp;
-                                               }
-                                               else {
+                                               } else {
                                                        pVCard->pCur->pSibling = pTemp;
                                                        pVCard->pCur = pTemp;
                                                }
@@ -975,7 +946,7 @@ vcard_decode( char *pCardRaw )
                                valueCount = 0;
 
 #ifdef VDATA_GROUPNAME_SUPPORTED
-                               if ( gszGroupName != NULL )
+                               if (gszGroupName != NULL)
                                        pVCard->pCur->pszGroupName = gszGroupName;
 #endif
                                break;
@@ -983,26 +954,24 @@ vcard_decode( char *pCardRaw )
                        case VCARD_PARAM_NAME_STATUS:
                        {
                                dLen = 0;
-                               param = __VCardGetParamName( pCardRaw, &status, &dLen );
+                               param = __VCardGetParamName(pCardRaw, &status, &dLen);
                                pCardRaw += dLen;
 
-                               if ( param_status != true ) {
+                               if (param_status != true) {
 
-                                       if ( ( pTmpParam = ( VParam* )calloc(1,  sizeof( VParam ) ) ) == NULL )
+                                       if ((pTmpParam = (VParam*)calloc(1,  sizeof(VParam))) == NULL)
                                                        goto CATCH;
 
                                        param_status = true;
                                        pVCard->pCur->pParam = pTmpParam;
-                                       memset( pTmpParam, 0x00, sizeof( VParam ) );
+                                       memset(pTmpParam, 0x00, sizeof(VParam));
                                        VDATA_TRACE("pTmpParam : %p", pTmpParam);
-                               }
-                               else
-                               {
-                                       if ( ( pTmpParam->pNext = ( VParam* )calloc(1,  sizeof( VParam ) ) ) == NULL )
+                               } else {
+                                       if ((pTmpParam->pNext = (VParam*)calloc(1,  sizeof(VParam))) == NULL)
                                                        goto CATCH;
 
                                        pTmpParam = pTmpParam->pNext;
-                                       memset( pTmpParam, 0x00, sizeof(VParam));
+                                       memset(pTmpParam, 0x00, sizeof(VParam));
                                        VDATA_TRACE("pTmpParam : %p", pTmpParam);
                                }
 
@@ -1012,33 +981,32 @@ vcard_decode( char *pCardRaw )
                        case VCARD_PARAM_VALUE_STATUS:
                                dLen = 0;
                                numberedParam = 0;
-                               switch ( pTmpParam->parameter )
-                               {
+                               switch (pTmpParam->parameter) {
                                        case VCARD_PARAM_TYPE:
-                                               szValue = __VCardGetParamVal( pCardRaw, &status, &dLen );
-                                               numberedParam |= __VCardGetValue( szValue, pTypeList, VCARD_TYPE_PARAM_NUM );
+                                               szValue = __VCardGetParamVal(pCardRaw, &status, &dLen);
+                                               numberedParam |= __VCardGetValue(szValue, pTypeList, VCARD_TYPE_PARAM_NUM);
                                                break;
                                        case VCARD_PARAM_VALUE:
-                                               szValue = __VCardGetParamVal( pCardRaw, &status, &dLen );
-                                               numberedParam |= __VCardGetValue( szValue, pValueList, VCARD_VALUE_PARAM_NUM );
+                                               szValue = __VCardGetParamVal(pCardRaw, &status, &dLen);
+                                               numberedParam |= __VCardGetValue(szValue, pValueList, VCARD_VALUE_PARAM_NUM);
                                                break;
                                        case VCARD_PARAM_ENCODING:
-                                               szValue = __VCardGetParamVal( pCardRaw, &status, &dLen );
-                                               numberedParam |= __VCardGetValue( szValue, pEncList, VCARD_ENCODE_PARAM_NUM );
+                                               szValue = __VCardGetParamVal(pCardRaw, &status, &dLen);
+                                               numberedParam |= __VCardGetValue(szValue, pEncList, VCARD_ENCODE_PARAM_NUM);
                                                enc = numberedParam;
                                                break;
                                        case VCARD_PARAM_CHARSET:
-                                               szValue = __VCardGetParamVal( pCardRaw, &status, &dLen );
-                                               numberedParam |= __VCardGetValue( szValue, pCharsetList, VCARD_CHARSET_PARAM_NUM );
+                                               szValue = __VCardGetParamVal(pCardRaw, &status, &dLen);
+                                               numberedParam |= __VCardGetValue(szValue, pCharsetList, VCARD_CHARSET_PARAM_NUM);
                                                break;
                                        case VCARD_PARAM_CONTEXT:
                                        case VCARD_PARAM_LANGUAGE:
                                                // prevent 7605 08.03.13
-                                               szValue = __VCardGetParamVal( pCardRaw, &status, &dLen );
+                                               szValue = __VCardGetParamVal(pCardRaw, &status, &dLen);
                                                numberedParam = 0;
                                                break;
                                        default:
-                                               szValue = __VCardGetParamVal( pCardRaw, &status, &dLen );
+                                               szValue = __VCardGetParamVal(pCardRaw, &status, &dLen);
 
                                                SET_PARAM_VALUE(numberedParam, szValue, pTypeList, VCARD_TYPE_PARAM_NUM, pTmpParam, VCARD_PARAM_TYPE, enc);
                                                SET_PARAM_VALUE(numberedParam, szValue, pValueList, VCARD_VALUE_PARAM_NUM, pTmpParam, VCARD_PARAM_VALUE, enc);
@@ -1052,7 +1020,7 @@ vcard_decode( char *pCardRaw )
                                                break;
                                }
 
-                               VDATA_TRACE("%d, %s, %p",numberedParam, szValue, pTmpParam);
+                               VDATA_TRACE("%d, %s, %p", numberedParam, szValue, pTmpParam);
                                pTmpParam->paramValue = numberedParam;
                                pTmpParam->pNext = NULL;
                                VFREE(szValue);
@@ -1060,14 +1028,13 @@ vcard_decode( char *pCardRaw )
                                break;
                        case VCARD_TYPE_VALUE_STATUS:
                                dLen = 0;
-                               temp = __VCardGetTypeVal( pCardRaw, &status, &dLen, enc, pVCard->pCur);
+                               temp = __VCardGetTypeVal(pCardRaw, &status, &dLen, enc, pVCard->pCur);
 
-                               if(valueCount <= VDATA_VALUE_COUNT_MAX) {
+                               if (valueCount <= VDATA_VALUE_COUNT_MAX) {
                                        pVCard->pCur->pszValue[valueCount] = temp;
                                        valueCount++;
                                        pVCard->pCur->valueCount = valueCount;
-                               }
-                               else
+                               } else
                                        VFREE(temp);
 
                                pCardRaw += dLen;
@@ -1077,18 +1044,18 @@ vcard_decode( char *pCardRaw )
 
        VFREE(pCardRawTmp);
 
-       if(pVCard->pTop == NULL)
+       if (pVCard->pTop == NULL)
                goto CATCH;
 
-       if(!vcard_ended) {
+       if (!vcard_ended) {
                goto CATCH1;
        }
        VDATA_TRACE_END
        return pVCard;
 
-CATCH :
+CATCH:
        VFREE(pTemp);
-CATCH1 :
+CATCH1:
        VFREE(pCardRawTmp);
        __VCardFreeVTreeMemory(pVCard);
        VDATA_TRACE_END
@@ -1102,7 +1069,7 @@ CATCH1 :
  * @return      char *              Encoded result
  */
 SLPAPI char*
-vcard_encode( VTree *pVCardRaw )
+vcard_encode(VTree *pVCardRaw)
 {
        VDATA_TRACE_BEGINE
        char*           pVCardRes = NULL;
@@ -1124,69 +1091,64 @@ vcard_encode( VTree *pVCardRaw )
 
        //VDATA_TRACE("START %d %d", pVCardRaw->pTop->property, lenTypeList);
 
-       for(;cnt < pVCardRaw->pTop->valueCount;cnt++) {
+       for (; cnt < pVCardRaw->pTop->valueCount; cnt++) {
 
-               if(pVCardRaw->pTop->pszValue[cnt] == NULL)  {
-                       VDATA_TRACE("pVCardRaw->pTop->valueCount : %d",pVCardRaw->pTop->valueCount);
+               if (pVCardRaw->pTop->pszValue[cnt] == NULL)  {
+                       VDATA_TRACE("pVCardRaw->pTop->valueCount : %d", pVCardRaw->pTop->valueCount);
                        VDATA_TRACE("pVCardRaw->pTop->pszValue[%d] : %s", cnt, pVCardRaw->pTop->pszValue[cnt]);
                        VDATA_TRACE_END
                        return NULL;
                }
        }
        total += sizeof(char) * (14 + 14);
-       if ( ( pVCardRes = ( char * )calloc(1,  total ) ) == NULL )
-       {
-               VDATA_TRACE(  "vcard_encode:calloc failed\n" );
+       if ((pVCardRes = (char *)calloc(1, total)) == NULL) {
+               VDATA_TRACE("vcard_encode:calloc failed\n");
                VDATA_TRACE_END
                return NULL;
        }
 
-       memcpy( pVCardRes, "BEGIN:VCARD\r\n", 14 );
-       g_strlcat( pVCardRes, "VERSION:2.1\r\n", total - strlen(pVCardRes));
+       memcpy(pVCardRes, "BEGIN:VCARD\r\n", 14);
+       g_strlcat(pVCardRes, "VERSION:2.1\r\n", total - strlen(pVCardRes));
 
        pTmpObj = pVCardRaw->pTop;
 
-       while ( true )
-       {
-               if(pTmpObj == NULL)
+       while (true) {
+               if (pTmpObj == NULL)
                        break;
 
-               if ( ( pTemp = __VCardTypeEncode( pTmpObj, pszCardTypeList[pTmpObj->property] ) ) != NULL )
-               {
-                       len = strlen( pTemp );
+               if ((pTemp = __VCardTypeEncode(pTmpObj, pszCardTypeList[pTmpObj->property])) != NULL) {
+                       len = strlen(pTemp);
                        total += len + sizeof(char) * 10;
-                       if ( ( pVCardRes = ( char* )realloc( pVCardRes, total ) ) == NULL )
-                       {
-                               VDATA_TRACE(  "vcard_encode():realloc failed\n");
-                               VFREE( pTemp );
+                       if ((pVCardRes = (char*)realloc(pVCardRes, total)) == NULL) {
+                               VDATA_TRACE("vcard_encode():realloc failed\n");
+                               VFREE(pTemp);
                                pTemp = NULL;
                                VDATA_TRACE_END
                                return NULL;
                        }
 
-                       if( strncmp(pTemp,"VERSION", strlen("VERSION")) != 0)
+                       if (strncmp(pTemp, "VERSION", strlen("VERSION")) != 0)
                                g_strlcat(pVCardRes, pTemp, total - strlen(pVCardRes));
 
                        VDATA_TRACE("pTemp : %s", pTemp);
 
-                       VFREE( pTemp );
+                       VFREE(pTemp);
                        pTemp = NULL;
                }
 
-               if ( pTmpObj->pSibling != NULL )
+               if (pTmpObj->pSibling != NULL)
                        pTmpObj = pTmpObj->pSibling;
                else
                        break;
        }
 
        total += sizeof(char) * 12;
-       if ( ( pVCardRes = ( char * )realloc( pVCardRes, total ) ) == NULL )
-       {
-               VDATA_TRACE(  "vcard_encode:realloc failed\n");
+       if ((pVCardRes = (char *)realloc(pVCardRes, total)) == NULL) {
+               VDATA_TRACE("vcard_encode:realloc failed\n");
                VDATA_TRACE_END
                return NULL;
        }
-       g_strlcat( pVCardRes, "END:VCARD\r\n", total - strlen(pVCardRes));
+       g_strlcat(pVCardRes, "END:VCARD\r\n", total - strlen(pVCardRes));
        VDATA_TRACE_END
        return pVCardRes;
 }
@@ -1201,19 +1163,18 @@ vcard_encode( VTree *pVCardRaw )
 int
 __VIsVcardFile(char *pCardRaw, int mode)
 {
-       int i=0;
+       int i = 0;
        bool rtnValue = true;
        char *pszVcardBegin = "BEGIN:VCARD";
 
-       switch(mode)
-       {
-               case CHECK_START :
-                       for(i=0; i < 11; i++)
-               if(*pszVcardBegin++ != *pCardRaw++)
+       switch (mode) {
+               case CHECK_START:
+                       for (i = 0; i < 11; i++)
+                               if (*pszVcardBegin++ != *pCardRaw++)
                                        rtnValue = false;
                        break;
 
-               default :
+               default:
                        rtnValue = false;
        }
        VDATA_TRACE_END
@@ -1229,7 +1190,7 @@ __VIsVcardFile(char *pCardRaw, int mode)
  * @return      char *              Encoded result
  */
 char*
-__VCardTypeEncode( VObject *pTypeObj, char *pType )
+__VCardTypeEncode(VObject *pTypeObj, char *pType)
 {
        VDATA_TRACE_BEGINE
        int                     len;
@@ -1242,154 +1203,141 @@ __VCardTypeEncode( VObject *pTypeObj, char *pType )
        int                     total = 0;
        int                     biLen = 0;
 
-       len = strlen( pType );
+       len = strlen(pType);
        biLen = pTypeObj->numOfBiData;
 
 #ifdef VDATA_GROUPNAME_SUPPORTED
-       if ( pTypeObj->pszGroupName != NULL )
-       {
-               len += strlen( pTypeObj->pszGroupName ) + 1;
+       if (pTypeObj->pszGroupName != NULL) {
+               len += strlen(pTypeObj->pszGroupName) + 1;
        }
 #endif // VDATA_GROUPNAME_SUPPORTED
-       if ( ( szTypeValue = ( char * )calloc(1,  total += ( len+1 ) ) ) == NULL )
-       {
-               VDATA_TRACE(  "__VCardTypeEncode():calloc failed\n");
+       if ((szTypeValue = (char *)calloc(1,  total += (len+1))) == NULL) {
+               VDATA_TRACE("__VCardTypeEncode():calloc failed\n");
                VDATA_TRACE_END
                return NULL;
        }
-       memset( szTypeValue, '\0', ( len+1 ) );
+       memset(szTypeValue, '\0', (len+1));
 #ifdef VDATA_GROUPNAME_SUPPORTED
-       if ( pTypeObj->pszGroupName != NULL )
-       {
-               g_strlcat( szTypeValue, pTypeObj->pszGroupName, total - strlen(szTypeValue));
-               g_strlcat( szTypeValue, ".", total - strlen(szTypeValue));
+       if (pTypeObj->pszGroupName != NULL) {
+               g_strlcat(szTypeValue, pTypeObj->pszGroupName, total - strlen(szTypeValue));
+               g_strlcat(szTypeValue, ".", total - strlen(szTypeValue));
        }
 #endif // VDATA_GROUPNAME_SUPPORTED
-       g_strlcat( szTypeValue, pType, total - strlen(szTypeValue));
-
-       pTemp = __VCardParamEncode( pTypeObj, &enc );
-       if ( pTemp != NULL )
-       {
-               len = strlen( pTemp );
-               if ( ( szTypeValue = ( char * )realloc( szTypeValue, ( total += len ) ) ) == NULL )
-               {
-                       VDATA_TRACE(  "__VCardTypeEncode():realloc failed\n");
-                       VFREE( pTemp );
+       g_strlcat(szTypeValue, pType, total - strlen(szTypeValue));
+
+       pTemp = __VCardParamEncode(pTypeObj, &enc);
+       if (pTemp != NULL) {
+               len = strlen(pTemp);
+               if ((szTypeValue = (char *)realloc(szTypeValue, (total += len))) == NULL) {
+                       VDATA_TRACE("__VCardTypeEncode():realloc failed\n");
+                       VFREE(pTemp);
                        pTemp = NULL
                        VDATA_TRACE_END;
                        return NULL;
                }
-               g_strlcat( szTypeValue, pTemp, total - strlen(szTypeValue));
-               VFREE( pTemp );
+               g_strlcat(szTypeValue, pTemp, total - strlen(szTypeValue));
+               VFREE(pTemp);
                pTemp = NULL;
        }
 
-       if ( ( szTypeValue = ( char * )realloc( szTypeValue, ( total += 2 ) ) ) == NULL )
-       {
+       if ((szTypeValue = (char *)realloc(szTypeValue, (total += 2))) == NULL) {
                VDATA_TRACE_END
                return NULL;
        }
 
-       g_strlcat( szTypeValue, ":", total - strlen(szTypeValue));
+       g_strlcat(szTypeValue, ":", total - strlen(szTypeValue));
 
        len = 0;
 
-       if(strcmp(pType, pszCardTypeList[19]) != 0)     {
-               for ( i = 0; i < pTypeObj->valueCount; i++ ) {
+       if (strcmp(pType, pszCardTypeList[19]) != 0)    {
+               for (i = 0; i < pTypeObj->valueCount; i++) {
 
-                       if(pTypeObj->pszValue[i] != NULL)
-                       len += strlen( pTypeObj->pszValue[i] );
-               }
-       }
-       else {
+                       if (pTypeObj->pszValue[i] != NULL)
+                               len += strlen(pTypeObj->pszValue[i]);
+         }
+       } else {
                len += biLen;
        }
 
-       for ( i = 0; i < pTypeObj->valueCount; i++ ) {
+       for (i = 0; i < pTypeObj->valueCount; i++) {
 
-               if ( i == 0 ) {
-                       if ( ( pEncode = ( char * )calloc(1,  len+20 ) ) == NULL ) {
+               if (i == 0) {
+                       if ((pEncode = (char *)calloc(1,  len+20)) == NULL) {
                                VFREE(szTypeValue);
                                VDATA_TRACE_END
                                return NULL;
                        }
 
-                       memset( pEncode, '\0', len+20 );
+                       memset(pEncode, '\0', len+20);
 
-                       if(strcmp(pType, pszCardTypeList[19]) != 0)     {
-                               g_strlcat( pEncode, pTypeObj->pszValue[i], len+20 - strlen(pEncode));
+                       if (strcmp(pType, pszCardTypeList[19]) != 0)    {
+                               g_strlcat(pEncode, pTypeObj->pszValue[i], len+20 - strlen(pEncode));
                                _VEscape(pEncode);
-                       }
-                       else
+                       } else {
                                memcpy(pEncode, pTypeObj->pszValue[i], biLen);
                        }
-               else {
+               else {
                        char    buf[1000];
-                       strncpy( buf, pTypeObj->pszValue[i], 999 );
-                       _VEscape( buf );
-                       g_strlcat( pEncode, ";", len+20 - strlen(pEncode));
-                       g_strlcat( pEncode, buf, len+20 - strlen(pEncode));
+                       strncpy(buf, pTypeObj->pszValue[i], 999);
+                       _VEscape(buf);
+                       g_strlcat(pEncode, ";", len+20 - strlen(pEncode));
+                       g_strlcat(pEncode, buf, len+20 - strlen(pEncode));
                }
        }
 
-       if(strcmp(pType, pszCardTypeList[19]) != 0)     {
+       if (strcmp(pType, pszCardTypeList[19]) != 0)    {
                if (pEncode) {
-                       g_strlcat( pEncode, "\0\0", len+20 - strlen(pEncode) );
-                       len = strlen( pEncode );
+                       g_strlcat(pEncode, "\0\0", len+20 - strlen(pEncode));
+                       len = strlen(pEncode);
                }
-       }
-       else {
+       } else {
                len = biLen;
        }
 
-       if ( enc & pEncList[2].flag ) {
-               if((pRes = (char *)calloc(1, len * 6 + 10)) == NULL) {
+       if (enc & pEncList[2].flag) {
+               if ((pRes = (char *)calloc(1, len * 6 + 10)) == NULL) {
                        VFREE(pEncode);
                        VFREE(szTypeValue);
                        VDATA_TRACE_END
                        return NULL;
                }
-               if(pEncode)
-                       _VQPEncode( pRes, pEncode );
+               if (pEncode)
+                       _VQPEncode(pRes, pEncode);
                VFREE(pEncode);
-                       }
-       else if(enc & pEncList[1].flag ) {
-               if((pRes = (char *)calloc(1, (len * 8 / 6) + 4)) == NULL){
+       } else if (enc & pEncList[1].flag) {
+               if ((pRes = (char *)calloc(1, (len * 8 / 6) + 4)) == NULL) {
                        VFREE(pEncode);
                        VFREE(szTypeValue);
                        VDATA_TRACE_END
                        return NULL;
                }
 
-               memset( pRes, '\0', ( ( len * 8 / 6 ) + 4 ) );
-               _VB64Encode( pRes, pEncode, biLen );
+               memset(pRes, '\0', ((len * 8 / 6) + 4));
+               _VB64Encode(pRes, pEncode, biLen);
                VFREE(pEncode);
-                       }
-       else {
-               if((pRes = (char *)calloc(1, len+30)) == NULL) {
+       } else {
+               if ((pRes = (char *)calloc(1, len+30)) == NULL) {
                        VFREE(pEncode);
                        VFREE(szTypeValue);
                        VDATA_TRACE_END
                        return NULL;
                }
-               memset( pRes, '\0', ( len + 30 ) );
-               if(pEncode)
-               {
-                       memcpy( pRes, pEncode, len );
+               memset(pRes, '\0', (len + 30));
+               if (pEncode) {
+                       memcpy(pRes, pEncode, len);
                        VFREE(pEncode);
                }
        }
 
-       if((pRes = (char *)realloc(pRes, strlen(pRes) + 3)) == NULL)
-       {
+       if ((pRes = (char *)realloc(pRes, strlen(pRes) + 3)) == NULL) {
                VFREE(pEncode);
                VFREE(szTypeValue);
                VDATA_TRACE_END
                return NULL;
        }
-       g_strlcat( pRes, "\r\n", 2);
+       g_strlcat(pRes, "\r\n", 2);
 
-       len = strlen( pRes );
+       len = strlen(pRes);
 
        if ((szTypeValue = (char *)realloc(szTypeValue, (total += (len+3)))) == NULL) {
                VFREE(pEncode);
@@ -1400,9 +1348,9 @@ __VCardTypeEncode( VObject *pTypeObj, char *pType )
 
        g_strlcat(szTypeValue, pRes, total - strlen(szTypeValue));
 
-       if(strcmp(pType, pszCardTypeList[19]) != 0) {
-               _VRLSpace( szTypeValue );
-               _VRTSpace( szTypeValue );
+       if (strcmp(pType, pszCardTypeList[19]) != 0) {
+               _VRLSpace(szTypeValue);
+               _VRTSpace(szTypeValue);
        }
 
        VFREE(pRes);
@@ -1433,9 +1381,8 @@ __VCardParamEncode(VObject* pTypeObj, int* pEnc)
        pTemp = pTypeObj->pParam;
 
        /** Momory Allocation for parameter string. */
-       if(pTemp != NULL) {
-               if ((szParam = (char*)calloc(1, len+=2)) == NULL)
-               {
+       if (pTemp != NULL) {
+               if ((szParam = (char*)calloc(1, len += 2)) == NULL) {
                        VDATA_TRACE_END
                        return NULL;
                }
@@ -1443,29 +1390,27 @@ __VCardParamEncode(VObject* pTypeObj, int* pEnc)
        }
 
        /** appending pamaters. */
-       while(true) {
+       while (true) {
 
-               if(pTemp == NULL) break;
+               if (pTemp == NULL) break;
 
                bSupported = false;
 
                /** Expand szParam string. For appending.*/
-               if((szParam = (char *)realloc(szParam, len += 15)) == NULL)
-               {
+               if ((szParam = (char *)realloc(szParam, len += 15)) == NULL) {
                        VDATA_TRACE_END
                        return NULL;
                }
 
                /** appending paramter name. */
-               g_strlcat( szParam, ";", len - strlen(szParam) );
-               if(pTemp->parameter != VCARD_PARAM_TYPE) {
-                       g_strlcat( szParam, pszCardParamList[pTemp->parameter], len - strlen(szParam));
-                       g_strlcat( szParam, "=", len - strlen(szParam));
+               g_strlcat(szParam, ";", len - strlen(szParam));
+               if (pTemp->parameter != VCARD_PARAM_TYPE) {
+                       g_strlcat(szParam, pszCardParamList[pTemp->parameter], len - strlen(szParam));
+                       g_strlcat(szParam, "=", len - strlen(szParam));
                }
 
                /** Set Parameter Value name. */
-               switch ( pTemp->parameter )
-               {
+               switch (pTemp->parameter) {
                        case VCARD_PARAM_ENCODING:
                                *pEnc = pTemp->paramValue;
                                shift = VCARD_ENCODE_PARAM_NUM;
@@ -1484,28 +1429,26 @@ __VCardParamEncode(VObject* pTypeObj, int* pEnc)
                                pList = pCharsetList; bSupported = true;
                                break;
                        default:
-                               if ( ( szParam = ( char* )realloc( szParam, 5 ) ) == NULL )
-                               {
+                               if ((szParam = (char*)realloc(szParam, 5)) == NULL) {
                                        VDATA_TRACE_END
                                        return NULL;
                                }
-                               g_strlcat( szParam, "NONE", 5 - strlen(szParam) );
+                               g_strlcat(szParam, "NONE", 5 - strlen(szParam));
                }
 
                /** exchage parameter value's to string.*/
-               if(bSupported == true) {
+               if (bSupported == true) {
 
-                       for(i = 0, sNum = 0x00000001; i < shift; i++) {
+                       for (i = 0, sNum = 0x00000001; i < shift; i++) {
 
-                               if(pTemp->paramValue & sNum) {
-                                       if((szParam = (char *)realloc(szParam, ( len += (strlen(pList[i].szName) + 2)))) == NULL)
-                                       {
+                               if (pTemp->paramValue & sNum) {
+                                       if ((szParam = (char *)realloc(szParam, (len += (strlen(pList[i].szName) + 2)))) == NULL) {
                                                VDATA_TRACE_END
                                                return NULL;
                                        }
 
-                                       g_strlcat( szParam, pList[i].szName, len - strlen(szParam));
-                                       g_strlcat( szParam, "; ", len - strlen(szParam));
+                                       g_strlcat(szParam, pList[i].szName, len - strlen(szParam));
+                                       g_strlcat(szParam, "; ", len - strlen(szParam));
                                }
 
                                sNum <<= 1;
@@ -1513,15 +1456,15 @@ __VCardParamEncode(VObject* pTypeObj, int* pEnc)
                }
 
                /** remove semicolon from tail. */
-               for(i = strlen( szParam ); i > 0 ; i--) {
+               for (i = strlen(szParam); i > 0 ; i--) {
 
-                       if ( szParam[i] == ' ' && szParam[i-1] == ';' ) {
+                       if (szParam[i] == ' ' && szParam[i-1] == ';') {
                                szParam[i-1] = '\0';
                                break;
                        }
                }
 
-               if ( pTemp->pNext != NULL )
+               if (pTemp->pNext != NULL)
                        pTemp = pTemp->pNext;
                else
                        break;
@@ -1534,8 +1477,7 @@ SLPAPI bool
 vcard_free_vtree_memory(VTree * pTree)
 {
        VDATA_TRACE_BEGINE
-       if(pTree == NULL)
-       {
+       if (pTree == NULL) {
                VDATA_TRACE_END
                return false;
        }
index ce2204e..9666807 100755 (executable)
@@ -35,12 +35,12 @@ char Base64Table[65] = {                                                                                                    'A',
 };
 
 /* Function Declaration */
-int            __VFindBase64( char );
-int            __VBase64Check( char * );
-int            __VRepChar2Space( char *, char );
-char   __VHexaDecoder( char * );
-void   __VHexaEncoder( char * );
-int            __VIsPrintable( char );
+int            __VFindBase64(char);
+int            __VBase64Check(char *);
+int            __VRepChar2Space(char *, char);
+char   __VHexaDecoder(char *);
+void   __VHexaEncoder(char *);
+int            __VIsPrintable(char);
 
 
 /**
@@ -52,16 +52,12 @@ int         __VIsPrintable( char );
  * @return     0                 'in' is not a space.
  */
 int
-_VIsSpace( char in )
+_VIsSpace(char in)
 {
-    if ( ( in == TAB ) || ( in == WSP ) )
-       {
+    if ((in == TAB) || (in == WSP))
                return 1;
-    }
        else
-       {
                return 0;
-    }
 }
 
 
@@ -72,32 +68,27 @@ _VIsSpace( char in )
  * @return     0                  if success.
  */
 int
-_VRLSpace( char *in )
+_VRLSpace(char *in)
 {
-    int                        i, j;
+    int        i, j;
     short int  done;
 
     i = 0;
     done = 0;
 
-    while ( !done && in[i] )
-       {
-               if ( _VIsSpace( in[i] ) )
-               {
+    while (!done && in[i]) {
+               if (_VIsSpace(in[i]))
                        i++;
-               }
                else
-               {
                        done = 1;
-               }
     }
 
     j = 0;
-    while ( in[i] )
-       {
+    while (in[i]) {
                in[j++] = in[i++];
     }
 
+
     in[j] = '\0';
 
     return 0;
@@ -111,7 +102,7 @@ _VRLSpace( char *in )
  * @return     0                  if success.
  */
 int
-_VRTSpace( char *in )
+_VRTSpace(char *in)
 {
     int                        i;
     short int  done;
@@ -119,16 +110,11 @@ _VRTSpace( char *in )
     i = strlen(in) - 1;
     done = 0;
 
-    while ( !done && !( i < 0 ) )
-       {
-               if ( _VIsSpace( in[i] ) )
-               {
+    while (!done && !(i < 0)) {
+               if (_VIsSpace(in[i]))
                        in[i--] = '\0';
-               }
                else
-               {
                        done = 1;
-               }
     }
 
     return(0);
@@ -142,31 +128,29 @@ _VRTSpace( char *in )
  * @return     0                  if success.
  */
 int
-_VUnescape( char *in )
+_VUnescape(char *in)
 {
-    int                        i;
-    int                        index;
+       int                     i;
+       int                     index;
        int                     len;
        char c1;
        char c2;
 
-    len = strlen(in);
+       len = strlen(in);
 
-    for ( i = 0, index = 0; i < len; i++ )
-       {
+       for (i = 0, index = 0; i < len; i++) {
                c1 = in[i];
 
-               if ( c1 == '\\' )
-               {
+               if (c1 == '\\') {
                        c2 = in[i+1];
-                       if ( c2 == ';' ) continue;
+                       if (c2 == ';') continue;
                }
                in[index++] = c1;
        }
 
        in[index] = '\0';
 
-    return(0);
+       return(0);
 }
 
 /*
@@ -176,7 +160,7 @@ _VUnescape( char *in )
  * @return     0                  if success.
  */
 int
-_VEscape( char *in )
+_VEscape(char *in)
 {
        int i;
        int index;
@@ -187,15 +171,15 @@ _VEscape( char *in )
        len = strlen(in);
        buf = (char*) calloc(1, len*2+1);
        if (buf) {
-               for ( i = 0, index = 0; i < len; i++ ){
+               for (i = 0, index = 0; i < len; i++) {
                        c = in[i];
-                       if ( c == ';' ) {
+                       if (c == ';')   {
                                buf[index++] = '\\';
                        }
                        buf[index++] = c;
                }
 
-               strncpy( in, buf, len*2+1 );
+               strncpy(in, buf, len*2+1);
                free(buf);
        }
 
@@ -211,25 +195,20 @@ _VEscape( char *in )
  * @return     int                length of converted string.
  */
 int
-_VManySpace2Space( char *in )
+_VManySpace2Space(char *in)
 {
     int                i, j;
     int                spaced = 0;
 
     j = 0;
-    for ( i = 0; in[i]; i++ )
-       {
-               if ( _VIsSpace( in[i] ) )
-               {
-                       if ( !spaced )
-                       {
+    for (i = 0; in[i]; i++) {
+               if (_VIsSpace(in[i])) {
+                       if (!spaced) {
                                in[j] = WSP;
                                spaced = 1;
                                j++;
                        }
-               }
-               else
-               {
+               } else {
                        spaced = 0;
                        in[j] = in[i];
                        j++;
@@ -250,13 +229,12 @@ _VManySpace2Space( char *in )
  * @return     int               The base64 table location of input character
  */
 int
-__VFindBase64( char in )
+__VFindBase64(char in)
 {
     int                i;
 
-    for ( i = 0; i < 65; i++ )
-       {
-               if ( Base64Table[i] == in )
+    for (i = 0; i < 65; i++) {
+               if (Base64Table[i] == in)
                        return i;
     }
     return -1;
@@ -271,20 +249,16 @@ __VFindBase64( char in )
  * @return     int              the total length of input except non-base64
  */
 int
-__VBase64Check( char *in )
+__VBase64Check(char *in)
 {
        int             i = 0, j = 0;
        int             base;
 
-       while ( in[i] )
-       {
-               base = __VFindBase64( in[i] );
-               if ( base < 0 )
-               {
+       while (in[i]) {
+               base = __VFindBase64(in[i]);
+               if (base < 0) {
                        i++;
-               }
-               else
-               {
+               } else {
                        in[j] = in[i];
                        j++; i++;
                }
@@ -303,7 +277,7 @@ __VBase64Check( char *in )
  * @return     int                The total length decoded value
  */
 int
-_VB64Decode( char *Dest, char *Src )
+_VB64Decode(char *Dest, char *Src)
 {
        char*           Encoded = Src;
        int                     i, j = 0;
@@ -314,30 +288,27 @@ _VB64Decode( char *Dest, char *Src )
        int                     index = 0;
        int                     len;
 
-       len = __VBase64Check( Src );
+       len = __VBase64Check(Src);
 
        VDATA_TRACE("total length of Src except non-base64 value = %d", len);
 
-       while ( *Encoded )
-       {
-               for ( i = 0; i < 3; i++ )
+       while (*Encoded) {
+               for (i = 0; i < 3; i++)
                        Debuffer[i] = 0x00;
 
-               for ( i = 0; i < 4; i++, Encoded++, j++ )
-               {
-                       if(*Encoded == 0x00) break;
-                       if((res = __VFindBase64(*Encoded)) < 0) continue;
+               for (i = 0; i < 4; i++, Encoded++, j++) {
+                       if (*Encoded == 0x00) break;
+                       if ((res = __VFindBase64(*Encoded)) < 0)        continue;
 
-                       Base = ( char )res;
+                       Base = (char)res;
                        DecodeTemp = 0x00;
 
-                       if(Base == 64)  {
+                       if (Base == 64) {
                                Encoded++;
                                break;
                        }
 
-                       switch ( i )
-                       {
+                       switch (i) {
                        case 0:
                                DecodeTemp = Base << 2;
                                Debuffer[0] |= DecodeTemp;
@@ -361,10 +332,8 @@ _VB64Decode( char *Dest, char *Src )
                        }
                }
 
-               if ( Base == 64 )
-               {
-                       switch ( i )
-                       {
+               if (Base == 64) {
+                       switch (i) {
                        case 0: break;
                        case 1:
                        case 2:
@@ -376,9 +345,7 @@ _VB64Decode( char *Dest, char *Src )
                                Dest[index++] = Debuffer[1];
                                break;
                        }
-               }
-               else
-               {
+               } else {
                        Dest[index++] = Debuffer[0];
                        Dest[index++] = Debuffer[1];
                        Dest[index++] = Debuffer[2];
@@ -397,7 +364,7 @@ _VB64Decode( char *Dest, char *Src )
  * @return     0
  */
 int
-_VB64Encode( char *Dest, char *Src, int len )
+_VB64Encode(char *Dest, char *Src, int len)
 {
        char*   Encoded = Dest;
        char*   Decoded = Src;
@@ -409,15 +376,13 @@ _VB64Encode( char *Dest, char *Src, int len )
        char    Debuffer[3] = {0,};
        int             length = 0;
 
-       for ( i = 0; i < 4; i++ )
+       for (i = 0; i < 4; i++)
                Enbuffer[i] = 0x00;
 
-       for ( i = 0; i < len; i++ )
-       {
+       for (i = 0; i < len; i++) {
                res = i%3;
 
-               switch ( res )
-               {
+               switch (res) {
                case 0:
                        Debuffer[0] = *Decoded;
                        break;
@@ -426,17 +391,17 @@ _VB64Encode( char *Dest, char *Src, int len )
                        break;
                case 2:
                        Debuffer[2] = *Decoded;
-                       index = ( int )( ( Debuffer[0] & 0xFC ) >> 2 );
+                       index = (int)((Debuffer[0] & 0xFC) >> 2);
                        Enbuffer[0] = Base64Table[index];
-                       base1 = ( int )( ( Debuffer[0] & 0x03 ) << 4 );
-                       base2 = ( int )( ( Debuffer[1] & 0xF0 ) >> 4 );
-                       index = ( int )( base1 | base2 );
+                       base1 = (int)((Debuffer[0] & 0x03) << 4);
+                       base2 = (int)((Debuffer[1] & 0xF0) >> 4);
+                       index = (int)(base1 | base2);
                        Enbuffer[1] = Base64Table[index];
-                       base1 = ( int )( ( Debuffer[1] & 0x0F ) << 2 );
-                       base2 = ( int )( ( Debuffer[2] & 0xC0 ) >> 6 );
-                       index = ( int )( base1 | base2 );
+                       base1 = (int)((Debuffer[1] & 0x0F) << 2);
+                       base2 = (int)((Debuffer[2] & 0xC0) >> 6);
+                       index = (int)(base1 | base2);
                        Enbuffer[2] = Base64Table[index];
-                       index = ( int )( Debuffer[2] & 0x3F );
+                       index = (int)(Debuffer[2] & 0x3F);
                        Enbuffer[3] = Base64Table[index];
 
                        Encoded[length++] = Enbuffer[0];
@@ -444,7 +409,7 @@ _VB64Encode( char *Dest, char *Src, int len )
                        Encoded[length++] = Enbuffer[2];
                        Encoded[length++] = Enbuffer[3];
 
-                       for ( j = 0; j < 3; j++ )
+                       for (j = 0; j < 3; j++)
                                Debuffer[j] = 0x00;
 
                        break;
@@ -455,16 +420,15 @@ _VB64Encode( char *Dest, char *Src, int len )
 
        res = i % 3;
 
-       switch ( res )
-       {
+       switch (res) {
        case 0:
                break;
        case 1:
-               index = ( int )( ( Debuffer[0] & 0xFC ) >> 2 );
+               index = (int)((Debuffer[0] & 0xFC) >> 2);
                Enbuffer[0] = Base64Table[index];
-               base1 = ( int )( ( Debuffer[0] & 0x03 ) << 4 );
-               base2 = ( int )( ( Debuffer[1] & 0xF0 ) >> 4 );
-               index = ( int )( base1 | base2 );
+               base1 = (int)((Debuffer[0] & 0x03) << 4);
+               base2 = (int)((Debuffer[1] & 0xF0) >> 4);
+               index = (int)(base1 | base2);
                Enbuffer[1] = Base64Table[index];
                Enbuffer[2] = Base64Table[64];
                Enbuffer[3] = Base64Table[64];
@@ -476,15 +440,15 @@ _VB64Encode( char *Dest, char *Src, int len )
 
                break;
        case 2:
-               index = ( int )( ( Debuffer[0] & 0xFC ) >> 2 );
+               index = (int)((Debuffer[0] & 0xFC) >> 2);
                Enbuffer[0] = Base64Table[index];
-               base1 = ( int )( ( Debuffer[0] & 0x03 ) << 4 );
-               base2 = ( int )( ( Debuffer[1] & 0xF0 ) >> 4 );
-               index = ( int )( base1 | base2 );
+               base1 = (int)((Debuffer[0] & 0x03) << 4);
+               base2 = (int)((Debuffer[1] & 0xF0) >> 4);
+               index = (int)(base1 | base2);
                Enbuffer[1] = Base64Table[index];
-               base1 = ( int )( ( Debuffer[1] & 0x0F ) << 2 );
-               base2 = ( int )( ( Debuffer[2] & 0xC0 ) >> 6 );
-               index = ( int )( base1 | base2 );
+               base1 = (int)((Debuffer[1] & 0x0F) << 2);
+               base2 = (int)((Debuffer[2] & 0xC0) >> 6);
+               index = (int)(base1 | base2);
                Enbuffer[2] = Base64Table[index];
                Enbuffer[3] = Base64Table[64];
 
@@ -504,13 +468,12 @@ _VB64Encode( char *Dest, char *Src, int len )
 
 
 int
-__VRepChar2Space( char *vRaw, char replaced )
+__VRepChar2Space(char *vRaw, char replaced)
 {
        int length = 0;
 
-       while ( *vRaw )
-       {
-               if ( *vRaw == replaced )
+       while (*vRaw) {
+               if (*vRaw == replaced)
                        *vRaw = WSP;
 
                vRaw++;
@@ -528,22 +491,19 @@ __VRepChar2Space( char *vRaw, char replaced )
  * @return     int                Total length of unfolded output
  */
 int
-_VUnfolding( char *string )
+_VUnfolding(char *string)
 {
        unsigned int i, j;
        unsigned int len;
 
-       len = strlen( string );
+       len = strlen(string);
 
-       for ( i = 0, j = 0; i < len; i++, j++ )
-       {
+       for (i = 0, j = 0; i < len; i++, j++) {
                string[j] = string[i];
 
-               // 12.03.2004 Process garbage character at the end of vcard/vcal
-               if ( _VIsSpace( string[i] ) &&  ( i < len-5 ) )
-               {
-                       if ( string[i-1] == LF || string[i-1] == CR )
-                       {
+               /* 12.03.2004 Process garbage character at the end of vcard/vcal */
+               if (_VIsSpace(string[i]) &&  (i < len-5)) {
+                       if (string[i-1] == LF || string[i-1] == CR) {
                                if (j < 2)
                                        j = 0;
                                else
@@ -551,8 +511,8 @@ _VUnfolding( char *string )
 
                                string[i-1] = 0;
                        }
-                       if ( string[i-2] == LF || string[i-2] == CR )
-                       {
+
+                       if (string[i-2] == LF || string[i-2] == CR) {
                                if (j < 1)
                                        j = 0;
                                else
@@ -570,21 +530,17 @@ _VUnfolding( char *string )
 
 
 int
-__VIsNewType( char *pCardRaw )
+__VIsNewType(char *pCardRaw)
 {
-       int count=0, i = 0, low=0, high=0, diff=0;
-       char strTypeName[50]={0};
+       int count = 0, i = 0, low = 0, high = 0, diff = 0;
+       char strTypeName[50] = {0};
 
-       while(1)
-       {
-               if(*pCardRaw == CR || *pCardRaw == LF)
+       while (1) {
+               if (*pCardRaw == CR || *pCardRaw == LF)
                        pCardRaw++;
-               else
-               {
-                       if(*pCardRaw == ';' || *pCardRaw == ':' || count >= 50)
-                       {
+               else {
+                       if (*pCardRaw == ';' || *pCardRaw == ':' || count >= 50)
                                break;
-                       }
                        else
                                strTypeName[count++] = *pCardRaw++;
                }
@@ -592,71 +548,65 @@ __VIsNewType( char *pCardRaw )
        }
 
 
-    for ( low = 0, high = VCARD_TYPE_NUM - 1; high >= low; diff < 0 ? ( low = i+1 ) : ( high = i-1 ) )
-       {
-               i = ( low + high ) / 2;
-               diff = strcmp( pszCardTypeList[i], strTypeName );
-               if ( diff == 0 )        /* success: found it */
+    for (low = 0, high = VCARD_TYPE_NUM - 1; high >= low; diff < 0 ? (low = i+1) : (high = i-1)) {
+               i = (low + high) / 2;
+               diff = strcmp(pszCardTypeList[i], strTypeName);
+               if (diff == 0)          /* success: found it */
                        return true;
     }
 
 
 
     return false;
-       //res = __VCardGetName( strTypeName, (char**)pszCardTypeList, VCARD_TYPE_NUM );
+       //res = __VCardGetName(strTypeName, (char**)pszCardTypeList, VCARD_TYPE_NUM);
 }
 
 
 int
-__VIsNewTypeforOrg( char *pCardRaw, int vType )
+__VIsNewTypeforOrg(char *pCardRaw, int vType)
 {
-       int count=0, i = 0, low=0, high=0, diff=0,vTypeNum;
-       char strTypeName[50]={0};
+       int count = 0, i = 0, low = 0, high = 0, diff = 0, vTypeNum;
+       char strTypeName[50] = {0};
        extern char* pszCardTypeList[];
        extern char* pszMsgTypeList[];
 
-       while(1)
-       {
-               if(*pCardRaw == CR || *pCardRaw == LF)
+       while (1) {
+               if (*pCardRaw == CR || *pCardRaw == LF)
                        pCardRaw++;
-               else
-               {
-                       if(*pCardRaw == ';' || *pCardRaw == ':' || count >= 50)
-                       {
+               else {
+                       if (*pCardRaw == ';' || *pCardRaw == ':' || count >= 50)
                                break;
-                       }
                        else
                                strTypeName[count++] = *pCardRaw++;
                }
        }
 
-       if(vType == VCARD)
+       if (vType == VCARD)
                vTypeNum = VCARD_TYPE_NUM;
-       else if(vType == VMESSAGE)
+       else if (vType == VMESSAGE)
                vTypeNum = VMSG_TYPE_NUM;
        else
                 return false;
 
-       for ( low = 0, high = vTypeNum - 1; high >= low; diff < 0 ? ( low = i+1 ) : ( high = i-1 ) )
-       {
-               i = ( low + high ) / 2;
+       for (low = 0, high = vTypeNum - 1; high >= low; diff < 0 ? (low = i+1) : (high = i-1)) {
+               i = (low + high) / 2;
 
-               if(vType == VCARD)
-                       diff = strcmp( pszCardTypeList[i], strTypeName );
-               else if(vType == VMESSAGE)
-                       diff = strcmp( pszMsgTypeList[i], strTypeName );
+               if (vType == VCARD)
+                       diff = strcmp(pszCardTypeList[i], strTypeName);
+               else if (vType == VMESSAGE)
+                       diff = strcmp(pszMsgTypeList[i], strTypeName);
 
-               if ( diff == 0 )        /* success: found it */
+               if (diff == 0)          /* success: found it */
                        return true;
-               else if( !strncmp( strTypeName, "X-", 2 ))
+               else if (!strncmp(strTypeName, "X-", 2))
                        return true;
        }
 
-       //if(count <= 50) return TRUE;
+       /* if (count <= 50) return TRUE; */
 
     return false;
 
-       //res = __VCardGetName( strTypeName, (char**)pszCardTypeList, VCARD_TYPE_NUM );
+       /* res = __VCardGetName(strTypeName, (char**)pszCardTypeList, VCARD_TYPE_NUM); */
 }
 
 char*
@@ -667,51 +617,46 @@ _VUnfoldingNoSpecNew(char *string)
 
        char* newString;
 
-       len = strlen( string );
+       len = strlen(string);
 
-       if( !(newString = (char*) calloc(1, len+1) )) {
+       if (!(newString = (char*) calloc(1, len+1))) {
                return NULL;
        }
 
 
-       for ( i = 0, j = 0; i < len; i++, j++ ) {
+       for (i = 0, j = 0; i < len; i++, j++) {
 
                newString[j] = string[i];
 
-               if( i < len-5 ) {
+               if (i < len-5) {
 
-                       if ( string[i] == '=' ) {
+                       if (string[i] == '=') {
 
-                               if(string[i+1] == CR && string[i+2] == LF) {
+                               if (string[i+1] == CR && string[i+2] == LF) {
 
-                                       if(__VIsNewType(string) == false){
+                                       if (__VIsNewType(string) == false) {
                                                j -= 2;
-                                       i += 2;
-                               }
-                               }
-                               else if(string[i+1] == CR || string[i+1] == LF) {
-                                       if(__VIsNewType(string) == false){
-                                       j -= 1;
-                                       i += 1;
+                                               i += 2;
+                                       }
+                               } else if (string[i+1] == CR || string[i+1] == LF) {
+                                       if (__VIsNewType(string) == false) {
+                                               j -= 1;
+                                               i += 1;
+                                       }
                                }
-                       }
-                       }
-                       else if(string[i] == ' ') {
+                       } else if (string[i] == ' ') {
 
-                               if(string[i-2] == CR && string[i-1] == LF) {
-                                       if(__VIsNewType(string) == false)
-                                       j -= 3;
+                               if (string[i-2] == CR && string[i-1] == LF) {
+                                       if (__VIsNewType(string) == false)
+                                               j -= 3;
                                        else
                                                j -= 1;
-                               }
-                               else if(string[i-1] == CR || string[i-1] == LF) {
+                               } else if (string[i-1] == CR || string[i-1] == LF) {
                                        j -= 2;
                                }
-                       }
-
-                       else if((string[i] == CR || string[i] == LF) && __VIsNewType(string) == false) {
+                       } else if ((string[i] == CR || string[i] == LF) && __VIsNewType(string) == false) {
 
-                               if(string[i+1] == LF) {
+                               if (string[i+1] == LF) {
                                        j -= 1;
                                        i += 1;
                                }
@@ -731,32 +676,26 @@ _VUnfoldingNoSpecNew(char *string)
  * @return     int                Total length of unfolded output
  */
 int
-_VUnfoldingNoSpec( char *string, int vType )
+_VUnfoldingNoSpec(char *string, int vType)
 {
        unsigned int i, j;
        unsigned int len;
 
-       len = strlen( string );
+       len = strlen(string);
 
-       for ( i = 0, j = 0; i < len; i++, j++ )
-       {
+       for (i = 0, j = 0; i < len; i++, j++) {
                string[j] = string[i];
 
-               if ( ( i < len-5 ) )
-               {
-                       if ( string[i] == '=' )
-                       {
-                               if(string[i+1] == CR && string[i+2] == LF && string[i+3] =='=' )
-                               {
+               if ((i < len-5)) {
+                       if (string[i] == '=') {
+                               if (string[i+1] == CR && string[i+2] == LF && string[i+3] == '=') {
                                        string[i] = 0;
                                        string[i+1] = 0;
                                        string[i+2] = 0;
                                        if (j > 0)
                                                 j -= 1;
                                        i += 2;
-                               }
-                               else if(string[i+1] == CR && string[i+2] == LF &&  __VIsNewTypeforOrg(&string[i+3], vType) == false)
-                               {
+                               } else if (string[i+1] == CR && string[i+2] == LF &&  __VIsNewTypeforOrg(&string[i+3], vType) == false) {
                                        string[i] = 0;
                                        string[i+1] = 0;
                                        string[i+2] = 0;
@@ -764,12 +703,8 @@ _VUnfoldingNoSpec( char *string, int vType )
                                                j -= 1;
                                        i += 2;
                                }
-                       }
-                       else if(string[i] ==WSP
-                               ||string[i]==TAB)
-                       {
-                               if(string[i-2] == CR && string[i-1] == LF)
-                               {
+                       } else if (string[i] == WSP || string[i] == TAB) {
+                               if (string[i-2] == CR && string[i-1] == LF) {
                                        string[i] = 0;
                                        string[i-1] = 0;
                                        string[i-2] = 0;
@@ -777,13 +712,11 @@ _VUnfoldingNoSpec( char *string, int vType )
                                                j -= 3;
                                        else
                                                j = 0;
-                               }
-                               else if(string[i-1] == CR || string[i-1] == LF)
-                               {
+                               } else if (string[i-1] == CR || string[i-1] == LF) {
                                        string[i] = 0;
                                        string[i-1] = 0;
 
-                                       if (j >=2)
+                                       if (j >= 2)
                                                j -= 2;
                                        else
                                                j = 0;
@@ -805,14 +738,12 @@ _VUnfoldingNoSpec( char *string, int vType )
  * @param      Dest               The destination buffer of folded result
  */
 void
-_VFolding( char *result, char *contentline )
+_VFolding(char *result, char *contentline)
 {
        int             i = 0;
 
-       while ( *contentline )
-       {
-               if ( i == 75 )
-               {
+       while (*contentline) {
+               if (i == 75) {
                        i = 0;
                        *result++ = '\r';
                        *result++ = '\n';
@@ -834,16 +765,14 @@ _VFolding( char *result, char *contentline )
  * @param      Dest               The destination buffer of folded result
  */
 void
-_VFoldingQP( char *result, char *contentline )
+_VFoldingQP(char *result, char *contentline)
 {
        int             i = 0;
 
-       while ( *contentline )
-       {
-               if ( i == 74 )
-               {
+       while (*contentline) {
+               if (i == 74) {
                        i = 0;
-                       *result++= '=';
+                       *result++ = '=';
                        *result++ = '\r';
                        *result++ = '\n';
                }
@@ -863,14 +792,12 @@ _VFoldingQP( char *result, char *contentline )
  * @param      Dest               The destination buffer of folded result
  */
 void
-_VFoldingNoSpace( char *result, char *contentline )
+_VFoldingNoSpace(char *result, char *contentline)
 {
        int             i = 0;
 
-       while ( *contentline )
-       {
-               if ( i == 75 )
-               {
+       while (*contentline) {
+               if (i == 75) {
                        i = 0;
                        *result++ = '\r';
                        *result++ = '\n';
@@ -891,41 +818,31 @@ _VFoldingNoSpace( char *result, char *contentline )
  * @return     int                The total length decoded value
  */
 int
-_VQPDecode( char *src )
+_VQPDecode(char *src)
 {
        int             i = 0, j = 0;
        char    qp[2];
        char    decodedNum;
 
-       while ( src[i] )
-       {
-               if ( src[i] == '=' )
-               {
-                       if ( !( _VIsSpace( src[i + 1] ) || ( src[i + 1] == '\r' ) || ( src[i+1] == '\n' ) ) )
-                       {
-                               if ( src[i + 1] == '0' && ( src[i + 2] == 'D' || src[i +2] == 'd' ) && src[i + 3] == '='
-                                       && src[i + 4] == '0' && ( src[i + 5] == 'A' || src[i + 5] == 'a' ) )
-                               {
+       while (src[i]) {
+               if (src[i] == '=') {
+                       if (!(_VIsSpace(src[i + 1]) || (src[i + 1] == '\r') || (src[i+1] == '\n'))) {
+                               if (src[i + 1] == '0' && (src[i + 2] == 'D' || src[i +2] == 'd') && src[i + 3] == '='
+                                       && src[i + 4] == '0' && (src[i + 5] == 'A' || src[i + 5] == 'a')) {
                                        src[j] = '\n';
                                        j++;
                                        i += 6;
-                               }
-                               else
-                               {
+                               } else {
                                        qp[0] = src[i + 1];
                                        qp[1] = src[i + 2];
-                                       decodedNum = __VHexaDecoder( qp );
+                                       decodedNum = __VHexaDecoder(qp);
                                        src[j] = decodedNum;
                                        i += 3; j++;
                                }
-                       }
-                       else
-                       {
+                       } else {
                                i += 3;
                        }
-               }
-               else
-               {
+               } else {
                        src[j] = src[i];
                        i++; j++;
                }
@@ -933,7 +850,7 @@ _VQPDecode( char *src )
 
        src[j] = '\0';
 
-       j =     _VManySpace2Space( src );
+       j =     _VManySpace2Space(src);
 
        return j;
 }
@@ -948,48 +865,36 @@ _VQPDecode( char *src )
  * @return     int                The total length decoded value
  */
 int
-_VQPEncode( char *dest, char *src )
+_VQPEncode(char *dest, char *src)
 {
        int             i = 0, j = 0, k = 0;
        char    encoded[2] = {0x0f, 0x0f};
 
-       while ( src[i] /*&& ( src[i] > 0 )*/ )
-       {
-               if ( k == 73 && _VIsSpace( src[i] ) )
-               {
-                       if( src[i] == WSP )
-                       {
+       while (src[i] /*&& (src[i] > 0)*/) {
+               if (k == 73 && _VIsSpace(src[i])) {
+                       if (src[i] == WSP) {
                                dest[j++] = '='; dest[j++] = '2'; dest[j++] = '0';
                                k += 3;
-                       }
-                       else if ( src[i] == TAB )
-                       {
+                       } else if (src[i] == TAB) {
                                dest[j++] = '='; dest[j++] = '0'; dest[j++] = '9';
                                k += 3;
                        }
-               }
-       /*      else if ( k == 76 )
-               {
+               /*} else if (k == 76) {
                        dest[j++] = '='; dest[j++] = WSP;
                        k = 0;
-               } */
-               else if ( !__VIsPrintable( src[i] ) )
-               {
+                       */
+               } else if (!__VIsPrintable(src[i])) {
                        dest[j++] = '=';
                        encoded[0] &= (src[i] >> 4);
                        encoded[1] &= (src[i]);
-                       __VHexaEncoder( encoded );
+                       __VHexaEncoder(encoded);
                        dest[j++] = encoded[0]; encoded[0] = 0x0f;
                        dest[j++] = encoded[1]; encoded[1] = 0x0f;
                        k += 3;
-               }
-               else if ( src[i] == '\r' || src[i] == '\n' )
-               {
+               } else if (src[i] == '\r' || src[i] == '\n') {
                        dest[j++] = '='; dest[j++] = '0'; dest[j++] = 'D'; k += 3;
                        dest[j++] = '='; dest[j++] = '0'; dest[j++] = 'A'; k += 3;
-               }
-               else
-               {
+               } else {
                        dest[j++] = src[i]; k++;
                }
                i++;
@@ -1008,12 +913,12 @@ _VQPEncode( char *dest, char *src )
  * @return     true/false            if input is printable :true else : false
  */
 int
-__VIsPrintable( char in )
+__VIsPrintable(char in)
 {
-       if ( in >= 33 && in <= 60 ) return true;
-       else if ( in >= 62 && in <= 126 ) return true;
-       else if ( in == WSP || in == TAB ) return true;
-       else if ( in == '\r' || in == '\n' ) return true;
+       if (in >= 33 && in <= 60) return true;
+       else if (in >= 62 && in <= 126) return true;
+       else if (in == WSP || in == TAB) return true;
+       else if (in == '\r' || in == '\n') return true;
        else return false;
 }
 
@@ -1026,16 +931,14 @@ __VIsPrintable( char in )
  * @return     char             Character representation of input hexadecimal value
  */
 char
-__VHexaDecoder( char *qp )
+__VHexaDecoder(char *qp)
 {
        int             i;
        char    decoded[2] = {0x00, 0x00};
        char    res;
 
-       for ( i = 0; i < 2; i++ )
-       {
-               switch ( qp[i] )
-               {
+       for (i = 0; i < 2; i++) {
+               switch (qp[i]) {
                case '0':
                        decoded[i] = 0x00;
                        break;
@@ -1093,7 +996,7 @@ __VHexaDecoder( char *qp )
                }
        }
 
-       res = ( char )( ( decoded[0] << 4 ) + decoded[1] );
+       res = (char)((decoded[0] << 4) + decoded[1]);
 
        return res;
 }
@@ -1106,14 +1009,12 @@ __VHexaDecoder( char *qp )
  * @return     qp               Character representation of input hexadecimal value
  */
 void
-__VHexaEncoder( char *qp )
+__VHexaEncoder(char *qp)
 {
        int             i;
 
-       for ( i = 0; i < 2; i++ )
-       {
-               switch ( qp[i] )
-               {
+       for (i = 0; i < 2; i++) {
+               switch (qp[i]) {
                case 0:
                        qp[i] = '0';
                        break;
@@ -1178,14 +1079,10 @@ __VHexaEncoder( char *qp )
 int
 _VIsCrLf(char in)
 {
-       if ( ( in == CR ) || ( in == LF ) )
-       {
+       if ((in == CR) || (in == LF))
                return 1;
-       }
        else
-       {
                return 0;
-       }
 }
 
 /*
@@ -1201,18 +1098,12 @@ _VManyCRLF2CRLF(char *pIn)
        bool    bCrLf = false, bFirstCrLf = true;
 
        j = 0;
-       for ( i = 0; pIn[i]; i++ )
-       {
-               if ( _VIsCrLf( pIn[i] ) && _VIsCrLf( pIn[i+1] ))
-               {
-                       if( bFirstCrLf && !bCrLf)
-                       {
+       for (i = 0; pIn[i]; i++) {
+               if (_VIsCrLf(pIn[i]) && _VIsCrLf(pIn[i+1])) {
+                       if (bFirstCrLf && !bCrLf) {
                                bCrLf = 1;
-                       }
-                       else if( !bFirstCrLf )
-                       {
-                               if ( !bCrLf )
-                               {
+                       } else if (!bFirstCrLf) {
+                               if (!bCrLf) {
                                        pIn[j] = CR;
                                        pIn[++j] = LF;
                                        bCrLf = true;
@@ -1220,9 +1111,7 @@ _VManyCRLF2CRLF(char *pIn)
                                }
                        }
                        i++;
-               }
-               else
-               {
+               } else {
                        bCrLf = false;
                        bFirstCrLf = false;
                        pIn[j] = pIn[i];
index a3dc504..a23f61f 100755 (executable)
 #define CHECK_START 1
 #define CHECK_END 2
 
-#define VFREE(obj) if(obj != NULL) { /*VDATA_TRACE("%p",obj);*/ free(obj); \
+#define VFREE(obj) if (obj != NULL) { /*VDATA_TRACE("%p",obj);*/ free(obj); \
        obj = NULL; \
 }
 
-#define TRIM(obj) if(obj != NULL) {\
+#define TRIM(obj) if (obj != NULL) {\
        _VRLSpace(obj);\
        _VRTSpace(obj);\
 }
 
-#define UPPER(obj,start,end) if(obj != NULL) {\
-       for(start = 0; start < end; start++)\
+#define UPPER(obj, start, end) if (obj != NULL) {\
+       for (start = 0; start < end; start++)\
                obj[start] = toupper(obj[start]);\
 }
 
 #define SET_PARAM_VALUE(PARAM, SZVALUE, LIST, LISTCNT, PARAMOBJ, PTYPE, ENC) {\
        PARAM = 0;\
        PARAM |= __VMsgGetValue(SZVALUE, LIST, LISTCNT);\
-       if ( PARAM != UNKNOWN_NAME ) {\
+       if (PARAM != UNKNOWN_NAME) {\
                PARAMOBJ->parameter = PTYPE;\
-               if(PTYPE == VMSG_PARAM_ENCODING)\
+               if (PTYPE == VMSG_PARAM_ENCODING)\
                        ENC = PARAM;\
                break;\
-       }\
+       } \
 }
 
-#define LENGTH_TYPE_LIST(obj, len) for(len =0; obj[len] != NULL; len++);
+#define LENGTH_TYPE_LIST(obj, len) for (len = 0; obj[len] != NULL; len++);
 
-extern char* _VUnfoldingNoSpecNew( char *string );
+extern char* _VUnfoldingNoSpecNew(char *string);
 
 /** GLOBAL VARIABLE DECLARATION AND INITIALIZATION */
 /** vMsg Types. */
-char* pszMsgTypeList[] =
-{
+char* pszMsgTypeList[] = {
        "BEGIN",
        "END",
        "TEL",
@@ -78,8 +77,7 @@ char* pszMsgTypeList[] =
 };
 
 /** Parameter */
-char* pszMsgParamList[] =
-{
+char* pszMsgParamList[] = {
        "CHARSET",
        "CONTEXT",
        "ENCODING",
@@ -89,8 +87,7 @@ char* pszMsgParamList[] =
 };
 
 /** Encoding value */
-ValueObj pMsgEncList[] =
-{
+ValueObj pMsgEncList[] = {
        {"B",                   0x00000001},
        {"BASE64",      0x00000002},
        {"QUOTED-PRINTABLE", 0x00000004},
@@ -99,16 +96,14 @@ ValueObj pMsgEncList[] =
 };
 
 /** Character set value */
-ValueObj pMsgCharsetList[] =
-{
+ValueObj pMsgCharsetList[] = {
        {"UTF-8",                       0x00000001},
        {"UTF-16",              0x00000002},
        {"ISO-8859-1",  0x00000004}
 };
 
 /** Value value */
-ValueObj pMsgValueList[] =
-{
+ValueObj pMsgValueList[] = {
        {"BINARY",                      0x00000001},
        {"BOOLEAN",                     0x00000002},
        {"DATE",                                0x00000004},
@@ -125,8 +120,7 @@ ValueObj pMsgValueList[] =
 };
 
 /** Type value */
-ValueObj pMsgTypeList[] =
-{
+ValueObj pMsgTypeList[] = {
        {"AIFF",                0x00000001},
        {"BBS",                 0x00000002},
        {"CAR",                 0x00000004},
@@ -164,7 +158,7 @@ int __VMsgGetValue(char*, const ValueObj*, int);
 int __VMsgGetTypeName(char*, int*, int*);
 int __VMsgGetParamName(char*, int*, int*);
 int __VIsVmsgFile(char*, int);
-char* __VMsgGetParamVal(char*,int*, int*);
+char* __VMsgGetParamVal(char*, int*, int*);
 char* __VMsgGetTypeVal(char*, int*, int*, int, VObject*);
 char* __VMsgTypeEncode(VObject*, char*);
 char* __VMsgParamEncode(VObject*, int*);
@@ -188,9 +182,9 @@ __VMsgGetName(char* szString, char* pszList[], int size)
        low = 0;
        high = size - 1;
 
-       for(; high >= low; diff<0 ? (low = i+1):(high = i-1)) {
-               i = ( low + high ) / 2;
-               if((diff = strcmp( pszList[i], szString )) == 0) /* success: found it */
+       for (; high >= low; diff < 0 ? (low = i+1) : (high = i-1)) {
+               i = (low + high) / 2;
+               if ((diff = strcmp(pszList[i], szString)) == 0) /* success: found it */
                        return i;
        }
        VDATA_TRACE_END
@@ -207,7 +201,7 @@ __VMsgGetName(char* szString, char* pszList[], int size)
  * @return     flag      The value's flag.
  */
 int
-__VMsgGetValue( char* szString, const ValueObj list[], int size)
+__VMsgGetValue(char* szString, const ValueObj list[], int size)
 {
        VDATA_TRACE_BEGINE
        int i = 0, diff = -1;
@@ -216,25 +210,22 @@ __VMsgGetValue( char* szString, const ValueObj list[], int size)
        SysRequireEx(szString, UNKNOWN_NAME);
        SysRequireEx(size > 0, UNKNOWN_NAME);
 
-       UPPER(szTemp,i,strlen(szTemp));
-
-       for(i = 0; i < size-1; i++)
-       {
-               VDATA_TRACE(" i : %d",i);
-               VDATA_TRACE(" for loop %d < %d, list[%d] : %p, list[%d].szName : %p",i,size,i,list[i],i,list[i].szName);
-               VDATA_TRACE(" i : %d",i);
-               if(list[i].szName != NULL)
-               {
-                       VDATA_TRACE(" list[%d].szName != NULL",i);
-                       VDATA_TRACE(" before strcmp %s %s",list[i].szName,szTemp);
-                       VDATA_TRACE(" before strcmp %d",strcmp(list[i].szName, szTemp));
-                       if((diff = strcmp(list[i].szName, szTemp)) == 0) /* success: found it */
-                       {
-                               VDATA_TRACE(" return %d",list[i].flag);
+       UPPER(szTemp, i, strlen(szTemp));
+
+       for (i = 0; i < size-1; i++) {
+               VDATA_TRACE(" i : %d", i);
+               VDATA_TRACE(" for loop %d < %d, list[%d] : %p, list[%d].szName : %p", i, size, i, list[i], i, list[i].szName);
+               VDATA_TRACE(" i : %d", i);
+               if (list[i].szName != NULL) {
+                       VDATA_TRACE(" list[%d].szName != NULL", i);
+                       VDATA_TRACE(" before strcmp %s %s", list[i].szName, szTemp);
+                       VDATA_TRACE(" before strcmp %d", strcmp(list[i].szName, szTemp));
+                       if ((diff = strcmp(list[i].szName, szTemp)) == 0) { /* success: found it */
+                               VDATA_TRACE(" return %d", list[i].flag);
                                VDATA_TRACE_END
                                return list[i].flag;
                        }
-                       VDATA_TRACE(" after strcmp %s %s",list[i].szName,szTemp);
+                       VDATA_TRACE(" after strcmp %s %s", list[i].szName, szTemp);
                }
        }
        VDATA_TRACE(" return UNKNOWN_NAME");
@@ -257,14 +248,14 @@ __VMsgGetTypeName(char* pVMsgRaw, int* pStatus, int* pDLen)
        VDATA_TRACE_BEGINE
        int     i, index, res;
        char    c;
-       char    name[MAX_TYPE_NAME_LEN+1]={0,};
+       char    name[MAX_TYPE_NAME_LEN+1] = {0,};
 
        SysRequireEx(pVMsgRaw, UNKNOWN_NAME);
 
        i = index = 0;
        res = UNKNOWN_NAME;
 
-       while(true) {
+       while (true) {
 
                GO_NEXT_CHAR(c, pVMsgRaw, pDLen);
 
@@ -273,7 +264,7 @@ __VMsgGetTypeName(char* pVMsgRaw, int* pStatus, int* pDLen)
                 * If TYPE NAME's value is over MAX_TYPE_NAME_LEN, return UNKNOWN_NAME.
                 * And then Decoding Step shoud not be changed.
                 */
-               if(index >= MAX_TYPE_NAME_LEN) {
+               if (index >= MAX_TYPE_NAME_LEN) {
                        *pStatus = VMSG_TYPE_NAME_STATUS;
                        res = UNKNOWN_NAME;
                        break;
@@ -284,40 +275,38 @@ __VMsgGetTypeName(char* pVMsgRaw, int* pStatus, int* pDLen)
                 * If VTYPE_TOKEN_SEMICOLON or VTYPE_TOKEN_COLON is faced with,
                 * find TYPE NAME's value in pszMsgTypeList, and then return searched result.
                 */
-               if ((c == VTYPE_TOKEN_SEMICOLON ) || ( c == VTYPE_TOKEN_COLON)) {
+               if ((c == VTYPE_TOKEN_SEMICOLON) || (c == VTYPE_TOKEN_COLON)) {
                        name[index] = 0x00;
                        TRIM(name);
-                       UPPER(name,i,index);
-                       res = __VMsgGetName( name, (char**)pszMsgTypeList, VMSG_TYPE_NUM );
+                       UPPER(name, i, index);
+                       res = __VMsgGetName(name, (char**)pszMsgTypeList, VMSG_TYPE_NUM);
                        break;
                }
                /**
                 * There is no new line in TYPE NAME.
                 * If new line character is faced with, return UNKNOWN_NAME;
                 */
-               else if ( ( c == '\r' ) || ( c == '\n' ) )
-               {
+               else if ((c == '\r') || (c == '\n')) {
                        (*pDLen)++;
                        *pStatus = VMSG_TYPE_NAME_STATUS;
                        res = UNKNOWN_NAME;
                        return res;
-               }
-               else if(_VIsSpace(c));
-               else    name[index++] = c;
+               } else if (_VIsSpace(c)) {
+               } else
+                       name[index++] = c;
        }
 
        /**
         *      Set Next Step.
         *
         */
-       if ( c == VTYPE_TOKEN_SEMICOLON )
+       if (c == VTYPE_TOKEN_SEMICOLON)
                /**
                 * This case next token is parameter. So set VMSG_PARAM_NAME_STATUS step.
                 */
                *pStatus = VMSG_PARAM_NAME_STATUS;
-       else
-       {
-               if(res != UNKNOWN_NAME)
+       else {
+               if (res != UNKNOWN_NAME)
                        /**
                         * This case next string is value. So set VMSG_TYPE_VALUE_STATUS step.
                         */
@@ -342,22 +331,21 @@ __VMsgGetTypeName(char* pVMsgRaw, int* pStatus, int* pDLen)
  * @return     res                     The index in type list
  */
 int
-__VMsgGetParamName( char* pVMsgRaw, int* pStatus, int* pDLen )
+__VMsgGetParamName(char* pVMsgRaw, int* pStatus, int* pDLen)
 {
        VDATA_TRACE_BEGINE
        int     i, index, res;
 
        char    c;
-       char    name[MAX_PARAM_NAME_LEN+1]={0,};
+       char    name[MAX_PARAM_NAME_LEN+1] = {0,};
        char* pTemp = pVMsgRaw;
 
-       SysRequireEx( pVMsgRaw, UNKNOWN_NAME );
+       SysRequireEx(pVMsgRaw, UNKNOWN_NAME);
 
        i = index = 0;
        res = UNKNOWN_NAME;
 
-       while ( true )
-       {
+       while (true) {
                GO_NEXT_CHAR(c, pVMsgRaw, pDLen);
 
                /**
@@ -365,7 +353,7 @@ __VMsgGetParamName( char* pVMsgRaw, int* pStatus, int* pDLen )
                 * If PARAM NAME's value is over MAX_PARAM_NAME_LEN, return UNKNOWN_NAME.
                 * And then Decoding Step shoud not be changed.
                 */
-               if(index >= MAX_PARAM_NAME_LEN) {
+               if (index >= MAX_PARAM_NAME_LEN) {
                        *pStatus = VMSG_TYPE_NAME_STATUS;
                        res = UNKNOWN_NAME;
                        break;
@@ -376,12 +364,12 @@ __VMsgGetParamName( char* pVMsgRaw, int* pStatus, int* pDLen )
                 * If VTYPE_TOKEN_EQUAL is faced with,
                 * find PARAM NAME's value in pszMsgParamList, and then return searched result.
                 */
-               if(c == VTYPE_TOKEN_EQUAL) {
+               if (c == VTYPE_TOKEN_EQUAL) {
                        name[index] = '\0';
                        TRIM(name);
                        UPPER(name, i, index);
-                       res = __VMsgGetName( name, ( char** )pszMsgParamList, VMSG_PARAM_NUM );
-                       if(res==UNKNOWN_NAME){
+                       res = __VMsgGetName(name, (char**)pszMsgParamList, VMSG_PARAM_NUM);
+                       if (res == UNKNOWN_NAME) {
                                (*pDLen) = 0;
                        }
                        *pStatus = VMSG_PARAM_VALUE_STATUS;
@@ -398,7 +386,7 @@ __VMsgGetParamName( char* pVMsgRaw, int* pStatus, int* pDLen )
                 * VMSG_PARAM_NAME_STATUS(current) -> VMSG_PARAM_VALUE_STATUS
                 * -> VMSG_TYPE_VALUE_STATUS -> MOVE TO NEXT TYPE
                 */
-               else if(c == VTYPE_TOKEN_COLON) {
+               else if (c == VTYPE_TOKEN_COLON) {
                        *pStatus = VMSG_PARAM_VALUE_STATUS;
                        pVMsgRaw = pTemp;
                        (*pDLen) = 0;
@@ -416,15 +404,15 @@ __VMsgGetParamName( char* pVMsgRaw, int* pStatus, int* pDLen )
                 * VMSG_PARAM_NAME_STATUS(current) -> VMSG_PARAM_NAME_STATUS
                 * -> VMSG_PARAM_VALUE_STATUS -> VMSG_TYPE_VALUE_STATUS -> MOVE TO NEXT TYPE
                 */
-               else if(c == VTYPE_TOKEN_SEMICOLON) {
+               else if (c == VTYPE_TOKEN_SEMICOLON) {
                        *pStatus = VMSG_PARAM_NAME_STATUS;
                        pVMsgRaw = pTemp;
                        (*pDLen) = 0;
                        res = UNKNOWN_NAME;
                        break;
-               }
-               else if((c == '\r') || (c == '\n') || (_VIsSpace(c)));
-               else
+               } else if ((c == '\r') || (c == '\n') || (_VIsSpace(c))) {
+
+               else
                        name[index++] = c;
        }
        VDATA_TRACE_END
@@ -447,40 +435,35 @@ __VMsgFreeVTreeMemory(VTree * pTree)
        int count = 0;
        int i = 0;
 
-       SysRequireEx( pTree->treeType == VMESSAGE, false );
-       SysRequireEx( pTree != NULL, false );
+       SysRequireEx(pTree->treeType == VMESSAGE, false);
+       SysRequireEx(pTree != NULL, false);
        VDATA_TRACE("vmsg_free_vtree_memory() entered.");
 
-       if (pTree->treeType != VMESSAGE)
-       {
+       if (pTree->treeType != VMESSAGE) {
                VDATA_TRACE_END
                return true;
        }
 
        pCurTree = pTree;
 
-       while(pCurTree)
-       {
+       while (pCurTree) {
                pNextTree = pCurTree->pNext;
                pCurObj = pCurTree->pTop;
 
-               while ( pCurObj )
-               {
+               while (pCurObj) {
 
                        pNextObj = pCurObj->pSibling;
                        count = pCurObj->valueCount;
 
-                       for ( i = 0; i < count; i++ ) {
-                               VFREE( pCurObj->pszValue[i]);
+                       for (i = 0; i < count; i++) {
+                               VFREE(pCurObj->pszValue[i]);
                        }
 
-                       if ( pCurObj->pParam )
-                       {
+                       if (pCurObj->pParam) {
 
                                pCurParam = pCurObj->pParam;
 
-                               while(pCurParam != NULL)
-                               {
+                               while (pCurParam != NULL) {
                                        pNextParam = pCurParam->pNext;
                                        VDATA_TRACE("pNEXT ==> %p", pCurParam->pNext);
                                        VDATA_TRACE("pPARAM ==> %p", pCurParam->parameter);
@@ -488,7 +471,7 @@ __VMsgFreeVTreeMemory(VTree * pTree)
                                        VDATA_TRACE("pCurParam : %p", pCurParam);
                                        VDATA_TRACE("pCurParam->parameter : %d", pCurParam->parameter);
                                        VDATA_TRACE("pCurParam->paramValue : %d", pCurParam->paramValue);
-                                       if(pNextParam != NULL) {
+                                       if (pNextParam != NULL) {
                                                VDATA_TRACE("pNextParam : %p", pNextParam);
                                                VDATA_TRACE("pNextParam->parameter : %d", pNextParam->parameter);
                                                VDATA_TRACE("pNextParam->paramValue : %d", pNextParam->paramValue);
@@ -498,11 +481,11 @@ __VMsgFreeVTreeMemory(VTree * pTree)
                                }
                        }
 
-                       VFREE( pCurObj );
+                       VFREE(pCurObj);
                        pCurObj = pNextObj;
                }
 
-               VFREE( pCurTree );
+               VFREE(pCurTree);
                pCurTree = pNextTree;
        }
 
@@ -521,7 +504,7 @@ __VMsgFreeVTreeMemory(VTree * pTree)
  * @return     buffer          The result value
  */
 char*
-__VMsgGetParamVal( char* pVMsgRaw, int* pStatus, int* pDLen )
+__VMsgGetParamVal(char* pVMsgRaw, int* pStatus, int* pDLen)
 {
        VDATA_TRACE_BEGINE
        int len = 0;
@@ -529,33 +512,33 @@ __VMsgGetParamVal( char* pVMsgRaw, int* pStatus, int* pDLen )
        char* pBuf = NULL;
        char* pTemp = pVMsgRaw;
 
-       SysRequireEx( pVMsgRaw, NULL );
+       SysRequireEx(pVMsgRaw, NULL);
 
-       while(true) {
+       while (true) {
                GO_NEXT_CHAR(c, pVMsgRaw, pDLen);
                len++;
-               switch(c) {
-                       case VTYPE_TOKEN_SEMICOLON :
+               switch (c) {
+                       case VTYPE_TOKEN_SEMICOLON:
                                *pStatus = VMSG_PARAM_NAME_STATUS;
                                break;
-                       case VTYPE_TOKEN_COLON :
+                       case VTYPE_TOKEN_COLON:
                                *pStatus = VMSG_TYPE_VALUE_STATUS;
                                break;
-                       case VTYPE_TOKEN_COMMA :
+                       case VTYPE_TOKEN_COMMA:
                                *pStatus = VMSG_PARAM_VALUE_STATUS;
                                break;
                }
-               ifc == VTYPE_TOKEN_SEMICOLON
+               if (c == VTYPE_TOKEN_SEMICOLON
                                || c == VTYPE_TOKEN_COLON
                                || c == VTYPE_TOKEN_COMMA
                                || c == 0x00)
                        break;
        }
 
-       if(len < 1 || (pBuf = (char *)calloc(1, len)) == NULL)
+       if (len < 1 || (pBuf = (char *)calloc(1, len)) == NULL)
                return NULL;
        memset(pBuf, 0x00, len);
-       memcpy( pBuf, pTemp, len-1 );
+       memcpy(pBuf, pTemp, len-1);
        TRIM(pBuf);
        VDATA_TRACE_END
        return pBuf;
@@ -570,7 +553,7 @@ __VMsgGetParamVal( char* pVMsgRaw, int* pStatus, int* pDLen )
  * @return     buffer          The result value
  */
 char*
-__VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pType)
+__VMsgGetTypeVal(char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pType)
 {
        VDATA_TRACE_BEGINE
        int num = 0;
@@ -586,25 +569,23 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
        int Status = 0;
        int Len = 0;
 
-       SysRequireEx( pVMsgRaw, NULL );
+       SysRequireEx(pVMsgRaw, NULL);
        VDATA_TRACE("pVMsgRaw: %s", pVMsgRaw);
-       while(true)
-       {
+       while (true) {
                GO_NEXT_CHAR(c, pVMsgRaw, pDLen);
 
-               ifc == 0x00)
+               if (c == 0x00)
                        break;
 
                len++;
 
                /** This case means that there are more type's value. */
-               if ( c == VTYPE_TOKEN_SEMICOLON && bEscape == false )
-               {
-                       if((pBuf = (char *)calloc(1, len)) == NULL)
+               if (c == VTYPE_TOKEN_SEMICOLON && bEscape == false) {
+                       if ((pBuf = (char *)calloc(1, len)) == NULL)
                                return NULL;
 
                        memset(pBuf, 0x00, len);
-                       memcpy(pBuf,pTemp,len-1);
+                       memcpy(pBuf, pTemp, len-1);
 
                        TRIM(pBuf);
                        _VUnescape(pBuf);
@@ -612,13 +593,11 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
                        *pStatus = VMSG_TYPE_VALUE_STATUS;
 
                        /** Base 64 Decoding */
-                       if((enc & pMsgEncList[1].flag) || (enc & pMsgEncList[0].flag))
-                       {
+                       if ((enc & pMsgEncList[1].flag) || (enc & pMsgEncList[0].flag)) {
 
                                bufferCount = (len * 6 / 8) + 2;
 
-                               if((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL)
-                               {
+                               if ((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL) {
                                        VFREE(pBuf);
                                        return NULL;
                                }
@@ -626,7 +605,7 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
                                memset(pTmpBuf, 0x00, bufferCount);
                                num = _VB64Decode(pTmpBuf, pBuf);
 
-                               if(pType != NULL)
+                               if (pType != NULL)
                                        pType->numOfBiData = num;
 
                                VFREE(pBuf);
@@ -636,23 +615,19 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
                        }
 
                        /** Quoted Printable Decoding */
-                       if(enc & pMsgEncList[2].flag)
-                       {
+                       if (enc & pMsgEncList[2].flag) {
 
                                int i = 0, j = 0;
 
-                               while(pBuf[i])
-                               {
-                                       if(pBuf[i] == '\n' || pBuf[i] == '\r')
-                                       {
+                               while (pBuf[i]) {
+                                       if (pBuf[i] == '\n' || pBuf[i] == '\r') {
                                                i++;
-                                               if(pBuf[i] == '\n'|| pBuf[i] == '\r')
+                                               if (pBuf[i] == '\n' || pBuf[i] == '\r')
                                                        i++;
 
-                                               if(pBuf[j-1] == '=')
+                                               if (pBuf[j-1] == '=')
                                                        j--;
-                                       }
-                                       else
+                                       } else
                                                pBuf[j++] = pBuf[i++];
                                }
                                pBuf[j] = '\0';
@@ -664,27 +639,22 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
                        break;
                }
 
-               if(c == '\\')
+               if (c == '\\')
                        bEscape = true;
-               else if(bEscape == true && c != VTYPE_TOKEN_SEMICOLON )
+               else if (bEscape == true && c != VTYPE_TOKEN_SEMICOLON)
                        bEscape = false;
-               else if((c == '\r') || (c == '\n'))
-               {
+               else if ((c == '\r') || (c == '\n')) {
                        c2 = *(pVMsgRaw-2);
 
-                       if(c2 == '=' && (enc & pMsgEncList[2].flag))
-                       {
+                       if (c2 == '=' && (enc & pMsgEncList[2].flag)) {
                                c1 = *pVMsgRaw;
-                               if((c1 == '\r') || (c1 == '\n'))
-                               {
+                               if ((c1 == '\r') || (c1 == '\n')) {
                                        pVMsgRaw += 1;
                                        (*pDLen) += 1;
                                        len++;
                                }
-                       }
-                       else if(__VMsgGetTypeName(pVMsgRaw, &Status, &Len) != UNKNOWN_NAME)
-                       {
-                               if((pBuf = (char *)calloc(1, len)) == NULL)
+                       } else if (__VMsgGetTypeName(pVMsgRaw, &Status, &Len) != UNKNOWN_NAME) {
+                               if ((pBuf = (char *)calloc(1, len)) == NULL)
                                        return NULL;
 
                                memset(pBuf, 0x00, len);
@@ -697,19 +667,16 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
 
                                c1 = *pVMsgRaw;
 
-                               if((c1 == '\r') || (c1 == '\n'))
-                               {
+                               if ((c1 == '\r') || (c1 == '\n')) {
                                        pVMsgRaw += 1;
                                        (*pDLen) += 1;
                                }
 
-                               if((enc & pMsgEncList[1].flag) || (enc & pMsgEncList[0].flag))
-                               {
+                               if ((enc & pMsgEncList[1].flag) || (enc & pMsgEncList[0].flag)) {
 
                                        bufferCount = (len * 6 / 8) + 5;
 
-                                       if((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL)
-                                       {
+                                       if ((pTmpBuf = (char *)calloc(1, bufferCount)) == NULL) {
                                                VFREE(pBuf);
                                                return NULL;
                                        }
@@ -717,7 +684,7 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
                                        memset(pTmpBuf, 0x00, bufferCount);
                                        num = _VB64Decode(pTmpBuf, pBuf);
 
-                                       if(pType != NULL)
+                                       if (pType != NULL)
                                                pType->numOfBiData = num;
 
                                        VFREE(pBuf);
@@ -726,22 +693,18 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
                                        break;
                                }
 
-                               if(enc & pMsgEncList[2].flag)
-                               {
+                               if (enc & pMsgEncList[2].flag) {
 
                                        int i = 0, j = 0;
 
-                                       while(pBuf[i])
-                                       {
-                                               if(pBuf[i] == '\n' || pBuf[i] == '\r')
-                                               {
+                                       while (pBuf[i]) {
+                                               if (pBuf[i] == '\n' || pBuf[i] == '\r') {
                                                        i++;
-                                                       if(pBuf[i] == '\n' || pBuf[i] == '\r')
+                                                       if (pBuf[i] == '\n' || pBuf[i] == '\r')
                                                                i++;
 
-                                                       if(pBuf[j-1] == '=') j--;
-                                               }
-                                               else
+                                                       if (pBuf[j-1] == '=') j--;
+                                               } else
                                                        pBuf[j++] = pBuf[i++];
                                        }
                                        pBuf[j] = '\0';
@@ -761,7 +724,7 @@ __VMsgGetTypeVal( char* pVMsgRaw, int* pStatus, int* pDLen, int enc, VObject* pT
 
 
 int
-VMsgGetTypeValue( int index )
+VMsgGetTypeValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VMsgGetTypeValue() enter..\n");
@@ -770,7 +733,7 @@ VMsgGetTypeValue( int index )
 }
 
 int
-VMsgGetValValue( int index )
+VMsgGetValValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VMsgGetValValue() enter..\n");
@@ -779,7 +742,7 @@ VMsgGetValValue( int index )
 }
 
 int
-VMsgGetEncValue( int index )
+VMsgGetEncValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VMsgGetEncValue() enter..\n");
@@ -788,7 +751,7 @@ VMsgGetEncValue( int index )
 }
 
 int
-VMsgGetCharsetValue( int index )
+VMsgGetCharsetValue(int index)
 {
        VDATA_TRACE_BEGINE
        VDATA_TRACE("VMsgGetCharsetValue() enter..\n");
@@ -803,7 +766,7 @@ VMsgGetCharsetValue( int index )
  * @return      vObject             The result value
  */
 SLPAPI VTree*
-vmsg_decode( char *pMsgRaw )
+vmsg_decode(char *pMsgRaw)
 {
        VDATA_TRACE_BEGINE;
 
@@ -839,92 +802,78 @@ vmsg_decode( char *pMsgRaw )
 
        len = _VUnfoldingNoSpec(pMsgRaw, VMESSAGE);
        pMsgRawTmp = pMsgRaw;
-       len = _VManySpace2Space( pMsgRaw );
+       len = _VManySpace2Space(pMsgRaw);
 
        VDATA_TRACE("ret value of _VManySpace2Space = %d", len);
 
-       if(!__VIsVmsgFile(pMsgRaw, CHECK_START)) {
+       if (!__VIsVmsgFile(pMsgRaw, CHECK_START)) {
                VFREE(pMsgRawTmp);
                VDATA_TRACE_END
                return NULL;
        }
 
-       while(true && !done)
-       {
+       while (true && !done) {
                c = *pMsgRaw;
 
-               if((c == '\0') || done)
+               if ((c == '\0') || done)
                        break;
 
-               switch(status) {
+               switch (status) {
                        case VMSG_TYPE_NAME_STATUS:
                                dLen = 0;
                                type = __VMsgGetTypeName(pMsgRaw, &status, &dLen);
 
-                               if(type == VMSG_TYPE_BEGIN)
+                               if (type == VMSG_TYPE_BEGIN)
                                        pVTree = pMsgRaw;
 
                                pMsgRaw += dLen;
 
-                               if(type == -1)
+                               if (type == -1)
                                        break;
 
-                               switch ( type )
-                               {
+                               switch (type) {
                                        case VMSG_TYPE_BEGIN:
                                                dLen = 0;
                                                enc = 0;
                                                szMsgBegin = __VMsgGetTypeVal(pMsgRaw, &status, &dLen, enc, NULL);
                                                pMsgRaw += dLen;
 
-                                               if(szMsgBegin == NULL)
+                                               if (szMsgBegin == NULL)
                                                        goto CATCH;
 
-                                               if(!strncmp(szMsgBegin, "VCARD", strlen("VCARD")))
-                                               {
+                                               if (!strncmp(szMsgBegin, "VCARD", strlen("VCARD"))) {
                                                        VDATA_TRACE("pVTree: %s", pVTree);
                                                        pVCard = vcard_decode(pVTree);
                                                        pCurrent->pNext = pVCard;
                                                        pCurrent = pVCard;
 
-                                                       dLen = ((strstr(pMsgRaw,"END:VCARD") + 9) - pMsgRaw);
+                                                       dLen = ((strstr(pMsgRaw, "END:VCARD") + 9) - pMsgRaw);
                                                        pMsgRaw += dLen;
-                                               }
-
-                                               else
-                                               {
+                                               } else {
 
-                                                       if(start_status == 1)
+                                                       if (start_status == 1)
                                                                goto CATCH;
 
 
-
-
-                                                       if(!strncmp(szMsgBegin, "VMSG", strlen("VMSG")))
-                                                       {
-                                                               if ( ( pVMsg = ( VTree* )calloc( 1, sizeof( VTree ) ) ) == NULL )
-                                                               {
+                                                       if (!strncmp(szMsgBegin, "VMSG", strlen("VMSG"))) {
+                                                               if ((pVMsg = (VTree*)calloc(1, sizeof(VTree))) == NULL) {
                                                                        start_status = 1;
                                                                        goto CATCH;
                                                                }
-                                                               memset(pVMsg,0x00, sizeof(VTree));
+                                                               memset(pVMsg, 0x00, sizeof(VTree));
 
                                                                pVMsg->treeType = VMESSAGE;
                                                                pVMsg->pTop = NULL;
                                                                pVMsg->pCur = NULL;
                                                                pVMsg->pNext = NULL;
                                                                pCurrent = pVMsg;
-                                                       }
-
-                                                       else if(!strncmp(szMsgBegin, "VBODY", strlen("VBODY")))
-                                                       {
-                                                               if ( ( pVBody = ( VTree* )calloc( 1, sizeof( VTree ) ) ) == NULL )
-                                                               {
+                                                       } else if (!strncmp(szMsgBegin, "VBODY", strlen("VBODY"))) {
+                                                               if ((pVBody = (VTree*)calloc(1, sizeof(VTree))) == NULL) {
                                                                        start_status = 1;
                                                                        goto CATCH;
                                                                }
 
-                                                               memset(pVBody,0x00, sizeof(VTree));
+                                                               memset(pVBody, 0x00, sizeof(VTree));
                                                                pVBody->treeType = VBODY;
                                                                pVBody->pTop = NULL;
                                                                pVBody->pCur = NULL;
@@ -942,13 +891,10 @@ vmsg_decode( char *pMsgRaw )
                                                enc = 0;
                                                //szMsgBegin = __VMsgGetTypeVal(pMsgRaw, &status, &dLen, enc, NULL);
 
-                                               if(!strncmp(pMsgRaw,"VMSG", strlen("VMSG")))
-                                               {
+                                               if (!strncmp(pMsgRaw, "VMSG", strlen("VMSG"))) {
                                                        done = true;
                                                        vmsg_ended = true;
-                                               }
-                                               else
-                                               {
+                                               } else {
                                                        status = VMSG_TYPE_NAME_STATUS;
                                                        //pMsgRaw += dLen;
                                                }
@@ -956,28 +902,26 @@ vmsg_decode( char *pMsgRaw )
                                                pMsgRaw += dLen;
                                                break;
 
-                                       case UNKNOWN_NAME :
+                                       case UNKNOWN_NAME:
                                                break;
 
                                        default:
-                                               if(UNKNOWN_NAME == type || type < 0) {
+                                               if (UNKNOWN_NAME == type || type < 0) {
                                                        status = VMSG_TYPE_NAME_STATUS;
                                                        break;
                                                }
 
-                                               if ( ( pTemp = ( VObject* )calloc( 1, sizeof( VObject ) ) ) == NULL )
-                                               {
+                                               if ((pTemp = (VObject*)calloc(1, sizeof(VObject))) == NULL) {
                                                        goto CATCH;
                                                }
 
-                                               memset( pTemp, 0, sizeof( VObject ) );
+                                               memset(pTemp, 0, sizeof(VObject));
                                                pTemp->property = type;
 
-                                               if ( pCurrent->pTop == NULL ) {
+                                               if (pCurrent->pTop == NULL) {
                                                        pCurrent->pTop = pTemp;
                                                        pCurrent->pCur = pTemp;
-                                               }
-                                               else {
+                                               } else {
                                                        pCurrent->pCur->pSibling = pTemp;
                                                        pCurrent->pCur = pTemp;
                                                }
@@ -993,26 +937,24 @@ vmsg_decode( char *pMsgRaw )
                        case VMSG_PARAM_NAME_STATUS:
                        {
                                dLen = 0;
-                               param = __VMsgGetParamName( pMsgRaw, &status, &dLen );
+                               param = __VMsgGetParamName(pMsgRaw, &status, &dLen);
                                pMsgRaw += dLen;
 
-                               if ( param_status != true ) {
+                               if (param_status != true) {
 
-                                       if ( ( pTmpParam = ( VParam* )calloc( 1, sizeof( VParam ) ) ) == NULL )
+                                       if ((pTmpParam = (VParam*)calloc(1, sizeof(VParam))) == NULL)
                                                        goto CATCH;
 
                                        param_status = true;
                                        pCurrent->pCur->pParam = pTmpParam;
-                                       memset( pTmpParam, 0x00, sizeof( VParam ) );
+                                       memset(pTmpParam, 0x00, sizeof(VParam));
                                        VDATA_TRACE("pTmpParam : %p", pTmpParam);
-                               }
-                               else
-                               {
-                                       if ( ( pTmpParam->pNext = ( VParam* )calloc( 1, sizeof( VParam ) ) ) == NULL )
+                               } else {
+                                       if ((pTmpParam->pNext = (VParam*)calloc(1, sizeof(VParam))) == NULL)
                                                        goto CATCH;
 
                                        pTmpParam = pTmpParam->pNext;
-                                       memset( pTmpParam, 0x00, sizeof(VParam));
+                                       memset(pTmpParam, 0x00, sizeof(VParam));
                                        VDATA_TRACE("pTmpParam : %p", pTmpParam);
                                }
 
@@ -1022,33 +964,32 @@ vmsg_decode( char *pMsgRaw )
                        case VMSG_PARAM_VALUE_STATUS:
                                dLen = 0;
                                numberedParam = 0;
-                               switch ( pTmpParam->parameter )
-                               {
+                               switch (pTmpParam->parameter) {
                                        case VMSG_PARAM_TYPE:
-                                               szValue = __VMsgGetParamVal( pMsgRaw, &status, &dLen );
-                                               numberedParam |= __VMsgGetValue( szValue, pMsgTypeList, VMSG_TYPE_PARAM_NUM );
+                                               szValue = __VMsgGetParamVal(pMsgRaw, &status, &dLen);
+                                               numberedParam |= __VMsgGetValue(szValue, pMsgTypeList, VMSG_TYPE_PARAM_NUM);
                                                break;
                                        case VMSG_PARAM_VALUE:
-                                               szValue = __VMsgGetParamVal( pMsgRaw, &status, &dLen );
-                                               numberedParam |= __VMsgGetValue( szValue, pMsgValueList, VMSG_VALUE_PARAM_NUM );
+                                               szValue = __VMsgGetParamVal(pMsgRaw, &status, &dLen);
+                                               numberedParam |= __VMsgGetValue(szValue, pMsgValueList, VMSG_VALUE_PARAM_NUM);
                                                break;
                                        case VMSG_PARAM_ENCODING:
-                                               szValue = __VMsgGetParamVal( pMsgRaw, &status, &dLen );
-                                               numberedParam |= __VMsgGetValue( szValue, pMsgEncList, VMSG_ENCODE_PARAM_NUM );
+                                               szValue = __VMsgGetParamVal(pMsgRaw, &status, &dLen);
+                                               numberedParam |= __VMsgGetValue(szValue, pMsgEncList, VMSG_ENCODE_PARAM_NUM);
                                                enc = numberedParam;
                                                break;
                                        case VMSG_PARAM_CHARSET:
-                                               szValue = __VMsgGetParamVal( pMsgRaw, &status, &dLen );
-                                               numberedParam |= __VMsgGetValue( szValue, pMsgCharsetList, VMSG_CHARSET_PARAM_NUM );
+                                               szValue = __VMsgGetParamVal(pMsgRaw, &status, &dLen);
+                                               numberedParam |= __VMsgGetValue(szValue, pMsgCharsetList, VMSG_CHARSET_PARAM_NUM);
                                                break;
                                        case VMSG_PARAM_CONTEXT:
                                        case VMSG_PARAM_LANGUAGE:
                                                // prevent 7605 08.03.13
-                                               szValue = __VMsgGetParamVal( pMsgRaw, &status, &dLen );
+                                               szValue = __VMsgGetParamVal(pMsgRaw, &status, &dLen);
                                                numberedParam = 0;
                                                break;
                                        default:
-                                               szValue = __VMsgGetParamVal( pMsgRaw, &status, &dLen );
+                                               szValue = __VMsgGetParamVal(pMsgRaw, &status, &dLen);
 
                                                SET_PARAM_VALUE(numberedParam, szValue, pMsgTypeList, VMSG_TYPE_PARAM_NUM, pTmpParam, VMSG_PARAM_TYPE, enc);
                                                SET_PARAM_VALUE(numberedParam, szValue, pMsgValueList, VMSG_VALUE_PARAM_NUM, pTmpParam, VMSG_PARAM_VALUE, enc);
@@ -1062,7 +1003,7 @@ vmsg_decode( char *pMsgRaw )
                                                break;
                                }
 
-                               VDATA_TRACE("%d, %s, %p",numberedParam, szValue, pTmpParam);
+                               VDATA_TRACE("%d, %s, %p", numberedParam, szValue, pTmpParam);
                                pTmpParam->paramValue = numberedParam;
                                pTmpParam->pNext = NULL;
                                VFREE(szValue);
@@ -1070,15 +1011,14 @@ vmsg_decode( char *pMsgRaw )
                                break;
                        case VMSG_TYPE_VALUE_STATUS:
                                dLen = 0;
-                               temp = __VMsgGetTypeVal( pMsgRaw, &status, &dLen, enc, pCurrent->pCur);
+                               temp = __VMsgGetTypeVal(pMsgRaw, &status, &dLen, enc, pCurrent->pCur);
 
-                               if(valueCount <= VDATA_VALUE_COUNT_MAX) {
+                               if (valueCount <= VDATA_VALUE_COUNT_MAX) {
                                        pCurrent->pCur->pszValue[valueCount] = temp;
                                        valueCount++;
                                        pCurrent->pCur->valueCount = valueCount;
                                        VDATA_TRACE("object property: %d, value: %s", pCurrent->pCur->property, pCurrent->pCur->pszValue[valueCount - 1]);
-                               }
-                               else
+                               } else
                                        VFREE(temp);
 
                                pMsgRaw += dLen;
@@ -1088,22 +1028,21 @@ vmsg_decode( char *pMsgRaw )
        VDATA_TRACE("pMsgRawTmp: %s", pMsgRawTmp);
        //VFREE(pMsgRawTmp);
 
-       if(pVMsg->pTop == NULL)
-       {
+       if (pVMsg->pTop == NULL) {
                VDATA_TRACE("pVMsg->Top: NULL");
                goto CATCH;
        }
 
-       if(!vmsg_ended) {
+       if (!vmsg_ended) {
                VDATA_TRACE("vmsg_ended: false");
                goto CATCH1;
        }
        VDATA_TRACE_END
        return pVMsg;
 
-CATCH :
+CATCH:
        VFREE(pTemp);
-CATCH1 :
+CATCH1:
        VFREE(szMsgBegin);
        VFREE(pMsgRawTmp);
        __VMsgFreeVTreeMemory(pVMsg);
@@ -1118,7 +1057,7 @@ CATCH1 :
  * @return      char *              Encoded result
  */
 SLPAPI char*
-vmsg_encode( VTree *pVMsgRaw )
+vmsg_encode(VTree *pVMsgRaw)
 {
        VDATA_TRACE_BEGINE
        char*           pVMsgRes = NULL;
@@ -1130,10 +1069,10 @@ vmsg_encode( VTree *pVMsgRaw )
        int                     total = 0;
        int             cnt = 0;
 
-       for(;cnt < pVMsgRaw->pTop->valueCount;cnt++) {
+       for (; cnt < pVMsgRaw->pTop->valueCount; cnt++) {
 
-               if(pVMsgRaw->pTop->pszValue[cnt] == NULL)  {
-                       VDATA_TRACE("pVMsgRaw->pTop->valueCount : %d",pVMsgRaw->pTop->valueCount);
+               if (pVMsgRaw->pTop->pszValue[cnt] == NULL)  {
+                       VDATA_TRACE("pVMsgRaw->pTop->valueCount : %d", pVMsgRaw->pTop->valueCount);
                        VDATA_TRACE("pVMsgRaw->pTop->pszValue[%d] : %s", cnt, pVMsgRaw->pTop->pszValue[cnt]);
                        VDATA_TRACE_END
                        return NULL;
@@ -1143,69 +1082,61 @@ vmsg_encode( VTree *pVMsgRaw )
        pTmpTree = pVMsgRaw;
        pTmpObj = pVMsgRaw->pTop;
 
-       while(true)
-       {
-               switch(pTmpTree->treeType)
-               {
+       while (true) {
+               switch (pTmpTree->treeType) {
                        case VMESSAGE:
                                if (pVMsgRes) {
                                        free(pVMsgRes);
                                        pVMsgRes = NULL;
                                }
 
-                               if ( ( pVMsgRes = ( char * )calloc( 1, sizeof( char ) * ( total += 13 ) ) ) == NULL )
-                               {
-                                       VDATA_TRACE(  "vmsg_encode:calloc failed\n" );
+                               if ((pVMsgRes = (char *)calloc(1, sizeof(char) * (total += 13))) == NULL) {
+                                       VDATA_TRACE("vmsg_encode:calloc failed\n");
                                        VDATA_TRACE_END
                                        return NULL;
                                }
-                               memcpy( pVMsgRes, "BEGIN:VMSG\r\n", 13 );
+                               memcpy(pVMsgRes, "BEGIN:VMSG\r\n", 13);
                                break;
 
                        case VBODY:
-                               if ( ( pTmpVMsgRes = ( char * )realloc( pVMsgRes,  sizeof( char ) * ( total += 14 ) ) ) == NULL )
-                               {
-                                       VDATA_TRACE(  "vmsg_encode:realloc failed\n" );
+                               if ((pTmpVMsgRes = (char *)realloc(pVMsgRes,  sizeof(char) * (total += 14))) == NULL) {
+                                       VDATA_TRACE("vmsg_encode:realloc failed\n");
                                        VFREE(pVMsgRes);
                                        VDATA_TRACE_END
                                        return NULL;
                                }
 
                                pVMsgRes = pTmpVMsgRes;
-                               g_strlcat( pVMsgRes, "BEGIN:VBODY\r\n", 13);
+                               g_strlcat(pVMsgRes, "BEGIN:VBODY\r\n", 13);
                                break;
 
                        case VCARD:
                                break;
                }
 
-               while ( true )
-               {
-                       if(pTmpObj == NULL)
+               while (true) {
+                       if (pTmpObj == NULL)
                                break;
 
-                       if ( ( pTemp = __VMsgTypeEncode( pTmpObj, pTmpObj->property == VCARD_TYPE_TEL ? "TEL" : pszMsgTypeList[pTmpObj->property] ) ) != NULL )
-                       {
-                               if(pTmpTree->treeType == VCARD)
-                               {
+                       if ((pTemp = __VMsgTypeEncode(pTmpObj, pTmpObj->property == VCARD_TYPE_TEL ? "TEL" : pszMsgTypeList[pTmpObj->property])) != NULL) {
+                               if (pTmpTree->treeType == VCARD) {
                                        char* encoded  = NULL;
 
                                        encoded = vcard_encode(pTmpTree);
                                        if (encoded == NULL) {
-                                               VDATA_TRACE(  "vcard_encode() failed\n");
+                                               VDATA_TRACE("vcard_encode() failed\n");
                                                VFREE(pTemp);
                                                VFREE(pVMsgRes);
                                                VDATA_TRACE_END
                                                return NULL;
                                        }
 
-                                       len= strlen(encoded);
+                                       len = strlen(encoded);
 
-                                       if ( ( pTmpVMsgRes = ( char* )realloc( pVMsgRes, ( total += len+10 ) ) ) == NULL )
-                                       {
-                                               VDATA_TRACE(  "vmsg_encode():realloc failed\n");
-                                               VFREE( pTemp );
-                                               VFREE( encoded );
+                                       if ((pTmpVMsgRes = (char*)realloc(pVMsgRes, (total += len+10))) == NULL)        {
+                                               VDATA_TRACE("vmsg_encode():realloc failed\n");
+                                               VFREE(pTemp);
+                                               VFREE(encoded);
                                                VFREE(pVMsgRes);
                                                VDATA_TRACE_END
                                                return NULL;
@@ -1214,18 +1145,15 @@ vmsg_encode( VTree *pVMsgRaw )
                                        pVMsgRes = pTmpVMsgRes;
                                        g_strlcat(pVMsgRes, encoded, len+10);
                                        VDATA_TRACE("pTemp : %s", encoded);
-                                       VFREE( pTemp );
-                                       VFREE( encoded );
+                                       VFREE(pTemp);
+                                       VFREE(encoded);
                                        break;
-                               }
-                               else
-                               {
-                                       len = strlen( pTemp );
-
-                                       if ( ( pTmpVMsgRes = ( char* )realloc( pVMsgRes, ( total += len+10 ) ) ) == NULL )
-                                       {
-                                               VDATA_TRACE(  "vmsg_encode():realloc failed\n");
-                                               VFREE( pTemp );
+                               }  else {
+                                       len = strlen(pTemp);
+
+                                       if ((pTmpVMsgRes = (char*)realloc(pVMsgRes, (total += len+10))) == NULL) {
+                                               VDATA_TRACE("vmsg_encode():realloc failed\n");
+                                               VFREE(pTemp);
                                                VFREE(pVMsgRes);
                                                VDATA_TRACE_END
                                                return NULL;
@@ -1233,9 +1161,9 @@ vmsg_encode( VTree *pVMsgRaw )
                                        pVMsgRes = pTmpVMsgRes;
                                        g_strlcat(pVMsgRes, pTemp, len+10);
                                        VDATA_TRACE("pTemp : %s", pTemp);
-                                       VFREE( pTemp );
+                                       VFREE(pTemp);
 
-                                       if ( pTmpObj->pSibling != NULL )
+                                       if (pTmpObj->pSibling != NULL)
                                                pTmpObj = pTmpObj->pSibling;
                                        else
                                                break;
@@ -1245,18 +1173,16 @@ vmsg_encode( VTree *pVMsgRaw )
 
                }
 
-               switch(pTmpTree->treeType)
-               {
+               switch (pTmpTree->treeType) {
                        case VBODY:
-                               if ( ( pTmpVMsgRes = ( char * )realloc( pVMsgRes, ( total += 12 ) ) ) == NULL )
-                               {
+                               if ((pTmpVMsgRes = (char *)realloc(pVMsgRes, (total += 12))) == NULL) {
                                        VFREE(pVMsgRes);
-                                       VDATA_TRACE(  "vcal_encode():realloc failed\n");
+                                       VDATA_TRACE("vcal_encode():realloc failed\n");
                                        return NULL;
                                }
 
                                pVMsgRes = pTmpVMsgRes;
-                               g_strlcat( pVMsgRes, "END:VBODY\r\n", 12);
+                               g_strlcat(pVMsgRes, "END:VBODY\r\n", 12);
                                break;
 
                        case VCARD:
@@ -1267,23 +1193,22 @@ vmsg_encode( VTree *pVMsgRaw )
 
                }
 
-               if ( pTmpTree->pNext != NULL )
+               if (pTmpTree->pNext != NULL)
                        pTmpTree = pTmpTree->pNext;
                else
                        break;
                pTmpObj = pTmpTree->pTop;
        }
 
-       if ( ( pTmpVMsgRes = ( char * )realloc( pVMsgRes, ( total += 11 ) ) ) == NULL )
-       {
-               VDATA_TRACE(  "vmsg_encode:realloc failed\n");
+       if ((pTmpVMsgRes = (char *)realloc(pVMsgRes, (total += 11))) == NULL) {
+               VDATA_TRACE("vmsg_encode:realloc failed\n");
                VFREE(pVMsgRes);
                VDATA_TRACE_END
                return NULL;
        }
 
        pVMsgRes = pTmpVMsgRes;
-       g_strlcat( pVMsgRes, "END:VMSG\r\n", 11);
+       g_strlcat(pVMsgRes, "END:VMSG\r\n", 11);
        VDATA_TRACE_END
        return pVMsgRes;
 }
@@ -1298,19 +1223,18 @@ vmsg_encode( VTree *pVMsgRaw )
 int
 __VIsVmsgFile(char *pMsgRaw, int mode)
 {
-       int i=0;
+       int i = 0;
        bool rtnValue = true;
        char *pszVmsgBegin = "BEGIN:VMSG";
 
-       switch(mode)
-       {
-               case CHECK_START :
-                       for(i=0; i < 10; i++)
-               if(*pszVmsgBegin++ != *pMsgRaw++)
+       switch (mode) {
+               case CHECK_START:
+                       for (i = 0; i < 10; i++)
+                               if (*pszVmsgBegin++ != *pMsgRaw++)
                                        rtnValue = false;
                        break;
 
-               default :
+               default:
                        rtnValue = false;
        }
        VDATA_TRACE_END
@@ -1326,7 +1250,7 @@ __VIsVmsgFile(char *pMsgRaw, int mode)
  * @return      char *              Encoded result
  */
 char*
-__VMsgTypeEncode( VObject *pTypeObj, char *pType )
+__VMsgTypeEncode(VObject *pTypeObj, char *pType)
 {
        VDATA_TRACE_BEGINE
        int                     len;
@@ -1339,150 +1263,130 @@ __VMsgTypeEncode( VObject *pTypeObj, char *pType )
        int                     total = 0;
        int                     biLen = 0;
 
-       len = strlen( pType );
+       len = strlen(pType);
        biLen = pTypeObj->numOfBiData;
 
-       if ( ( szTypeValue = ( char * )calloc( 1, total += ( len+1 ) ) ) == NULL )
-       {
-               VDATA_TRACE(  "__VMsgTypeEncode():calloc failed\n");
+       if ((szTypeValue = (char *)calloc(1, total += (len+1))) == NULL) {
+               VDATA_TRACE("__VMsgTypeEncode():calloc failed\n");
                VDATA_TRACE_END
                return NULL;
        }
-       memset( szTypeValue, '\0', ( len+1 ) );
-       g_strlcat( szTypeValue, pType, len+1);
-
-       pTemp = __VMsgParamEncode( pTypeObj, &enc );
-       if ( pTemp != NULL )
-       {
-               len = strlen( pTemp );
-               if ( ( szTypeValue = ( char * )realloc( szTypeValue, ( total += len ) ) ) == NULL )
-               {
-                       VDATA_TRACE(  "__VMsgTypeEncode():realloc failed\n");
-                       VFREE( pTemp );
+       memset(szTypeValue, '\0', (len+1));
+       g_strlcat(szTypeValue, pType, len+1);
+
+       pTemp = __VMsgParamEncode(pTypeObj, &enc);
+       if (pTemp != NULL) {
+               len = strlen(pTemp);
+               if ((szTypeValue = (char *)realloc(szTypeValue, (total += len))) == NULL) {
+                       VDATA_TRACE("__VMsgTypeEncode():realloc failed\n");
+                       VFREE(pTemp);
                        pTemp = NULL
                        VDATA_TRACE_END;
                        return NULL;
                }
-               g_strlcat( szTypeValue, pTemp, len);
-               VFREE( pTemp );
+               g_strlcat(szTypeValue, pTemp, len);
+               VFREE(pTemp);
                pTemp = NULL;
        }
 
-       if ( ( szTypeValue = ( char * )realloc( szTypeValue, ( total += 2 ) ) ) == NULL )
-       {
+       if ((szTypeValue = (char *)realloc(szTypeValue, (total += 2))) == NULL) {
                VDATA_TRACE_END
                return NULL;
        }
 
-       g_strlcat( szTypeValue, ":", 2 );
+       g_strlcat(szTypeValue, ":", 2);
 
        len = 0;
 
-       if(strcmp(pType, pszMsgTypeList[6]) != 0)       {
-               for ( i = 0; i < pTypeObj->valueCount; i++ ) {
+       if (strcmp(pType, pszMsgTypeList[6]) != 0) {
+               for (i = 0; i < pTypeObj->valueCount; i++) {
 
-                       if(pTypeObj->pszValue[i] != NULL)
-                       len += strlen( pTypeObj->pszValue[i] );
-               }
-       }
-       else
+                       if (pTypeObj->pszValue[i] != NULL)
+                               len += strlen(pTypeObj->pszValue[i]);
+         }
+       } else
                len += biLen;
 
 
-       for ( i = 0; i < pTypeObj->valueCount; i++ ) {
+       for (i = 0; i < pTypeObj->valueCount; i++) {
 
-               if ( i == 0 )
-               {
-                       if ( ( pEncode = ( char * )calloc( 1, len+20 ) ) == NULL )
-                       {
+               if (i == 0) {
+                       if ((pEncode = (char *)calloc(1, len+20)) == NULL) {
                                VFREE(szTypeValue);
                                VDATA_TRACE_END
                                return NULL;
                        }
 
-                       memset( pEncode, '\0', len+20 );
+                       memset(pEncode, '\0', len+20);
 
-                       if(strcmp(pType, pszMsgTypeList[6]) != 0)
-                       {
-                               g_strlcat( pEncode, pTypeObj->pszValue[i], 20 );
+                       if (strcmp(pType, pszMsgTypeList[6]) != 0) {
+                               g_strlcat(pEncode, pTypeObj->pszValue[i], 20);
                                _VEscape(pEncode);
-                       }
-                       else
+                       } else
                                memcpy(pEncode, pTypeObj->pszValue[i], biLen);
-               }
-               else
-               {
+               } else {
                        char    buf[1000];
-                       strncpy( buf, pTypeObj->pszValue[i], 999 );
-                       _VEscape( buf );
-                       g_strlcat( pEncode, ";" , len+20);
-                       g_strlcat( pEncode, buf , len+20);
+                       strncpy(buf, pTypeObj->pszValue[i], 999);
+                       _VEscape(buf);
+                       g_strlcat(pEncode, ";" , len+20);
+                       g_strlcat(pEncode, buf , len+20);
                }
        }
 
-       if(strcmp(pType, pszMsgTypeList[6]) != 0)       {
+       if (strcmp(pType, pszMsgTypeList[6]) != 0)      {
                if (pEncode) {
-                       g_strlcat( pEncode, "\0\0", 2);
-                       len = strlen( pEncode );
+                       g_strlcat(pEncode, "\0\0", 2);
+                       len = strlen(pEncode);
                }
-       }
-       else {
+       } else {
                len = biLen;
        }
 
-       if ( enc & pMsgEncList[2].flag ) {
-               if((pRes = (char *)calloc(1, len * 6 + 10)) == NULL) {
+       if (enc & pMsgEncList[2].flag) {
+               if ((pRes = (char *)calloc(1, len * 6 + 10)) == NULL) {
                        VFREE(pEncode);
                        VFREE(szTypeValue);
                        VDATA_TRACE_END
                        return NULL;
                }
-               if(pEncode)
-                       _VQPEncode( pRes, pEncode );
+               if (pEncode)
+                       _VQPEncode(pRes, pEncode);
                VFREE(pEncode);
-                       }
-       else if(enc & pMsgEncList[1].flag )
-       {
-               if((pRes = (char *)calloc(1, (len * 8 / 6) + 48)) == NULL)
-               {
+       } else if (enc & pMsgEncList[1].flag) {
+               if ((pRes = (char *)calloc(1, (len * 8 / 6) + 48)) == NULL) {
                        VFREE(pEncode);
                        VFREE(szTypeValue);
                        VDATA_TRACE_END
                        return NULL;
                }
 
-               memset( pRes, '\0', ( ( len * 8 / 6 ) + 48 ) );
-               _VB64Encode( pRes, pEncode, biLen );
-               VDATA_TRACE(  "Origin Size: %d, Allocated Size %d, Coverted Size: %d\n", biLen, ( len * 8 / 6 ) + 48, strlen(pRes));
+               memset(pRes, '\0', ((len * 8 / 6) + 48));
+               _VB64Encode(pRes, pEncode, biLen);
+               VDATA_TRACE("Origin Size: %d, Allocated Size %d, Coverted Size: %d\n", biLen, (len * 8 / 6) + 48, strlen(pRes));
                VFREE(pEncode);
-       }
-       else
-       {
-               if((pRes = (char *)calloc(1, len+30)) == NULL)
-               {
+       } else {
+               if ((pRes = (char *)calloc(1, len+30)) == NULL) {
                        VFREE(pEncode);
                        VFREE(szTypeValue);
                        VDATA_TRACE_END
                        return NULL;
                }
-               memset( pRes, '\0', ( len + 30 ) );
-               if(pEncode)
-               {
-                       memcpy( pRes, pEncode, len );
+               memset(pRes, '\0', (len + 30));
+               if (pEncode) {
+                       memcpy(pRes, pEncode, len);
                        VFREE(pEncode);
                }
        }
 
-       if((pRes = (char *)realloc(pRes, strlen(pRes) + 3)) == NULL)
-       {
+       if ((pRes = (char *)realloc(pRes, strlen(pRes) + 3)) == NULL) {
                VFREE(pEncode);
                VFREE(szTypeValue);
                VDATA_TRACE_END
                return NULL;
        }
-       g_strlcat( pRes, "\r\n", strlen(pRes) + 2);
+       g_strlcat(pRes, "\r\n", strlen(pRes) + 2);
 
-       len = strlen( pRes );
+       len = strlen(pRes);
 
        if ((szTypeValue = (char *)realloc(szTypeValue, (total += (len+3)))) == NULL) {
                VFREE(pEncode);
@@ -1493,9 +1397,9 @@ __VMsgTypeEncode( VObject *pTypeObj, char *pType )
 
        g_strlcat(szTypeValue, pRes, total - 1);
 
-       if(strcmp(pType, pszMsgTypeList[6]) != 0) {
-               _VRLSpace( szTypeValue );
-               _VRTSpace( szTypeValue );
+       if (strcmp(pType, pszMsgTypeList[6]) != 0) {
+               _VRLSpace(szTypeValue);
+               _VRTSpace(szTypeValue);
        }
 
        VFREE(pRes);
@@ -1527,9 +1431,8 @@ __VMsgParamEncode(VObject* pTypeObj, int* pEnc)
        pTemp = pTypeObj->pParam;
 
        /** Momory Allocation for parameter string. */
-       if(pTemp != NULL) {
-               if ((szParam = (char*)calloc(1, len+=2)) == NULL)
-               {
+       if (pTemp != NULL) {
+               if ((szParam = (char*)calloc(1, len += 2)) == NULL) {
                        VDATA_TRACE_END
                        return NULL;
                }
@@ -1537,29 +1440,27 @@ __VMsgParamEncode(VObject* pTypeObj, int* pEnc)
        }
 
        /** appending pamaters. */
-       while(true) {
+       while (true) {
 
-               if(pTemp == NULL) break;
+               if (pTemp == NULL) break;
 
                bSupported = false;
 
                /** Expand szParam string. For appending.*/
-               if((szParam = (char *)realloc(szParam, len += 15)) == NULL)
-               {
+               if ((szParam = (char *)realloc(szParam, len += 15)) == NULL) {
                        VDATA_TRACE_END
                        return NULL;
                }
 
                /** appending paramter name. */
-               g_strlcat( szParam, ";" , len);
-               if(pTemp->parameter != VMSG_PARAM_TYPE) {
-                       g_strlcat( szParam, pszMsgParamList[pTemp->parameter], len);
-                       g_strlcat( szParam, "=", len);
+               g_strlcat(szParam, ";" , len);
+               if (pTemp->parameter != VMSG_PARAM_TYPE) {
+                       g_strlcat(szParam, pszMsgParamList[pTemp->parameter], len);
+                       g_strlcat(szParam, "=", len);
                }
 
                /** Set Parameter Value name. */
-               switch ( pTemp->parameter )
-               {
+               switch (pTemp->parameter) {
                        case VMSG_PARAM_ENCODING:
                                *pEnc = pMsgEncList[pTemp->paramValue].flag;
                                shift = VMSG_ENCODE_PARAM_NUM;
@@ -1578,28 +1479,26 @@ __VMsgParamEncode(VObject* pTypeObj, int* pEnc)
                                pList = pMsgCharsetList; bSupported = true;
                                break;
                        default:
-                               if ( ( szParam = ( char* )realloc( szParam, 5 ) ) == NULL )
-                               {
+                               if ((szParam = (char*)realloc(szParam, 5)) == NULL) {
                                        VDATA_TRACE_END
                                        return NULL;
                                }
-                               g_strlcat( szParam, "NONE", strlen("NONE"));
+                               g_strlcat(szParam, "NONE", strlen("NONE"));
                }
 
                /** exchage parameter value's to string.*/
-               if(bSupported == true) {
+               if (bSupported == true) {
 
-                       for(i = 0, sNum = 0x00000001; i < shift; i++) {
+                       for (i = 0, sNum = 0x00000001; i < shift; i++) {
 
-                               if(pList[pTemp->paramValue].flag & sNum) {
-                                       if((szParam = (char *)realloc(szParam, ( len += (strlen(pList[i].szName) + 2)))) == NULL)
-                                       {
+                               if (pList[pTemp->paramValue].flag & sNum) {
+                                       if ((szParam = (char *)realloc(szParam, (len += (strlen(pList[i].szName) + 2)))) == NULL) {
                                                VDATA_TRACE_END
                                                return NULL;
                                        }
 
-                                       g_strlcat( szParam, pList[i].szName, len);
-                                       g_strlcat( szParam, "; ", len);
+                                       g_strlcat(szParam, pList[i].szName, len);
+                                       g_strlcat(szParam, "; ", len);
                                }
 
                                sNum <<= 1;
@@ -1607,15 +1506,15 @@ __VMsgParamEncode(VObject* pTypeObj, int* pEnc)
                }
 
                /** remove semicolon from tail. */
-               for(i = strlen( szParam ); i > 0 ; i--) {
+               for (i = strlen(szParam); i > 0 ; i--) {
 
-                       if ( szParam[i] == ' ' && szParam[i-1] == ';' ) {
+                       if (szParam[i] == ' ' && szParam[i-1] == ';') {
                                szParam[i-1] = '\0';
                                break;
                        }
                }
 
-               if ( pTemp->pNext != NULL )
+               if (pTemp->pNext != NULL)
                        pTemp = pTemp->pNext;
                else
                        break;
@@ -1628,8 +1527,7 @@ SLPAPI bool
 vmsg_free_vtree_memory(VTree * pTree)
 {
        VDATA_TRACE_BEGINE
-       if(pTree == NULL)
-       {
+       if (pTree == NULL) {
                VDATA_TRACE_END
                return false;
        }