projects / platform / core / pim / contacts-service.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 97e7172)
Revise marshal/unmarshal codes 18/47418/1
authorSunggoo Kim <sung.goo.kim@samsung.com>
Tue, 12 May 2015 04:53:24 +0000 (13:53 +0900)
committerGukhwan Cho <gh78.cho@samsung.com>
Thu, 3 Sep 2015 08:05:48 +0000 (17:05 +0900)
Change-Id: I175676abf8da28d36694c7a8c56ffd30005e3009

client/ctsvc_client_activity_helper.c patch | blob | history
client/ctsvc_client_db_helper.c patch | blob | history
client/ctsvc_client_group_helper.c patch | blob | history
client/ctsvc_client_ipc.c patch | blob | history
client/ctsvc_client_person_helper.c patch | blob | history
client/ctsvc_client_phonelog_helper.c patch | blob | history
client/ctsvc_client_setting.c patch | blob | history
server/ctsvc_ipc_server.c patch | blob | history
server/ctsvc_ipc_server2.c patch | blob | history
server/ctsvc_server_change_subject.c patch | blob | history

diff --git a/client/ctsvc_client_activity_helper.c b/client/ctsvc_client_activity_helper.c
index fd5bb86..d960c5a 100644 (file)
--- a/client/ctsvc_client_activity_helper.c
+++ b/client/ctsvc_client_activity_helper.c
@@ -73,15 +73,22 @@ int ctsvc_client_activity_delete_by_contact_id(contacts_h contact, int contact_i
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
+               int transaction_ver = 0;
+
                // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
-                       int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
-
                pims_ipc_data_destroy(outdata);
        }
 
@@ -129,15 +136,21 @@ int ctsvc_client_activity_delete_by_account_id(contacts_h contact, int account_i
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               int transaction_ver = 0;
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+
                if (CONTACTS_ERROR_NONE == ret) {
-                       int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
-
                pims_ipc_data_destroy(outdata);
        }
 
diff --git a/client/ctsvc_client_db_helper.c b/client/ctsvc_client_db_helper.c
index 38a4292..35d53b9 100644 (file)
--- a/client/ctsvc_client_db_helper.c
+++ b/client/ctsvc_client_db_helper.c
@@ -82,19 +82,29 @@ int ctsvc_client_db_insert_record(contacts_h contact, contacts_record_h record,
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE) {
+               if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
 
-                       if (id)
-                               *id = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (id) {
+                               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, id)) {
+                                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                                       pims_ipc_data_destroy(outdata);
+                                       return CONTACTS_ERROR_IPC;
+                               }
+                       }
                }
-
                pims_ipc_data_destroy(outdata);
        }
 
@@ -151,18 +161,20 @@ int ctsvc_client_db_get_record(contacts_h contact, const char* view_uri, int id,
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
-
-               if (ret == CONTACTS_ERROR_NONE)
-               {
-                       ret = ctsvc_ipc_unmarshal_record(outdata,out_record);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_record(outdata, out_record)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
-
                pims_ipc_data_destroy(outdata);
        }
-
        return ret;
 }
 
@@ -207,19 +219,23 @@ int ctsvc_client_db_update_record(contacts_h contact, contacts_record_h record)
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
                        CTSVC_RECORD_RESET_PROPERTY_FLAGS((ctsvc_record_s *)record);
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
-
                pims_ipc_data_destroy(outdata);
        }
-
        return ret;
 }
 
@@ -270,12 +286,18 @@ int ctsvc_client_db_delete_record(contacts_h contact, const char* view_uri, int
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -333,12 +355,18 @@ int ctsvc_client_db_replace_record(contacts_h contact, contacts_record_h record,
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
                pims_ipc_data_destroy(outdata);
@@ -402,12 +430,18 @@ int ctsvc_client_db_get_all_records(contacts_h contact, const char* view_uri, in
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_list(outdata,out_list);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_list(outdata, out_list)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_list() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
@@ -469,12 +503,18 @@ int ctsvc_client_db_get_records_with_query(contacts_h contact, contacts_query_h
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_list(outdata,out_list);
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_list(outdata, out_list)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_list() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
 
                pims_ipc_data_destroy(outdata);
@@ -527,12 +567,18 @@ int ctsvc_client_db_get_count(contacts_h contact, const char* view_uri, int *out
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_int(outdata,out_count);
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, out_count)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
 
                pims_ipc_data_destroy(outdata);
@@ -583,14 +629,19 @@ int ctsvc_client_db_get_count_with_query(contacts_h contact, contacts_query_h qu
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
-
-               if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_int(outdata,out_count);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
                }
 
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, out_count)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
+               }
                pims_ipc_data_destroy(outdata);
        }
 
@@ -641,22 +692,46 @@ int ctsvc_client_db_insert_records(contacts_h contact, contacts_list_h list, int
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE) {
+               if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
 
                        if (ids && count) {
                                int i = 0;
                                int *id = NULL;
                                int c;
-                               c = *(int*)pims_ipc_data_get(outdata, &size);
+
+                               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &c)) {
+                                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                                       pims_ipc_data_destroy(outdata);
+                                       return CONTACTS_ERROR_IPC;
+                               }
                                id = calloc(c, sizeof(int));
-                               for(i=0;i<c;i++)
-                                       id[i] = *(int*) pims_ipc_data_get(outdata, &size);
+                               if (NULL == id) {
+                                       CTS_ERR("calloc() Fail");
+                                       pims_ipc_data_destroy(outdata);
+                                       return CONTACTS_ERROR_OUT_OF_MEMORY;
+                               }
+
+                               for (i=0;i<c;i++) {
+                                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &(id[i]))) {
+                                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                                               pims_ipc_data_destroy(outdata);
+                                               free(id);
+                                               return CONTACTS_ERROR_IPC;
+                                       }
+                               }
                                *ids = id;
                                *count = c;
                        }
@@ -707,11 +782,19 @@ int ctsvc_client_db_update_records(contacts_h contact, contacts_list_h list)
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -778,12 +861,19 @@ int ctsvc_client_db_delete_records(contacts_h contact, const char* view_uri, int
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -853,11 +943,18 @@ int ctsvc_client_db_replace_records(contacts_h contact, contacts_list_h list, in
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
                pims_ipc_data_destroy(outdata);
@@ -922,18 +1019,24 @@ int ctsvc_client_db_get_changes_by_version(contacts_h contact, const char* view_
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_list(outdata,record_list);
-
-                       if (ret == CONTACTS_ERROR_NONE) {
-                               ret = ctsvc_ipc_unmarshal_int(outdata,current_contacts_db_version);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_list(outdata, record_list)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_list() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, current_contacts_db_version)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
                        }
                }
-
                pims_ipc_data_destroy(outdata);
        }
 
@@ -975,11 +1078,18 @@ int ctsvc_client_db_get_current_version(contacts_h contact, int* contacts_db_ver
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
-               if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_int(outdata,contacts_db_version);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, contacts_db_version)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
@@ -1046,13 +1156,18 @@ int ctsvc_client_db_search_records(contacts_h contact, const char* view_uri, con
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE)
-               {
-                       ret = ctsvc_ipc_unmarshal_list(outdata,out_list);
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_list(outdata, out_list)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_list() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
 
                pims_ipc_data_destroy(outdata);
@@ -1125,11 +1240,18 @@ int ctsvc_client_db_search_records_with_range(contacts_h contact, const char* vi
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
-
-               if (ret == CONTACTS_ERROR_NONE)
-                       ret = ctsvc_ipc_unmarshal_list(outdata,out_list);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_list(outdata, out_list)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_list() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
+               }
                pims_ipc_data_destroy(outdata);
        }
 
@@ -1195,12 +1317,18 @@ int ctsvc_client_db_search_records_with_query(contacts_h contact, contacts_query
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check outdata
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE) {
-                       ret = ctsvc_ipc_unmarshal_list(outdata,out_list);
+               if (CONTACTS_ERROR_NONE == ret) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_list(outdata, out_list)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_list() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
 
                pims_ipc_data_destroy(outdata);
@@ -1296,10 +1424,17 @@ int ctsvc_client_db_get_status(contacts_h contact, contacts_db_status_e *status)
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
-                       *status = *(int*) pims_ipc_data_get(outdata, &size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, (int *)status)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
diff --git a/client/ctsvc_client_group_helper.c b/client/ctsvc_client_group_helper.c
index 7f42439..215290a 100644 (file)
--- a/client/ctsvc_client_group_helper.c
+++ b/client/ctsvc_client_group_helper.c
@@ -78,13 +78,19 @@ int ctsvc_client_group_add_contact(contacts_h contact, int group_id, int contact
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -142,13 +148,19 @@ int ctsvc_client_group_remove_contact(contacts_h contact, int group_id, int cont
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -211,13 +223,19 @@ int ctsvc_client_group_set_group_order(contacts_h contact, int group_id, int pre
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
diff --git a/client/ctsvc_client_ipc.c b/client/ctsvc_client_ipc.c
index 3c17bea..23ca6f2 100644 (file)
--- a/client/ctsvc_client_ipc.c
+++ b/client/ctsvc_client_ipc.c
@@ -306,12 +306,18 @@ int ctsvc_ipc_client_check_permission(int permission, bool *result)
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
-               if (ret == CONTACTS_ERROR_NONE) {
-                       if (result)
-                               *result = *(bool*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE == ret && result) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_bool(outdata, result)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_bool() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
diff --git a/client/ctsvc_client_person_helper.c b/client/ctsvc_client_person_helper.c
index 4d17f7a..cdbe165 100644 (file)
--- a/client/ctsvc_client_person_helper.c
+++ b/client/ctsvc_client_person_helper.c
@@ -91,13 +91,19 @@ int ctsvc_client_person_link_person(contacts_h contact, int base_person_id, int
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -157,19 +163,29 @@ int ctsvc_client_person_unlink_contact(contacts_h contact, int person_id, int co
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
 
-                       if (unlinked_person_id)
-                               *unlinked_person_id = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (unlinked_person_id) {
+                               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, unlinked_person_id)) {
+                                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                                       pims_ipc_data_destroy(outdata);
+                                       return CONTACTS_ERROR_IPC;
+                               }
+                       }
                }
-
                pims_ipc_data_destroy(outdata);
        }
 
@@ -224,13 +240,19 @@ int ctsvc_client_person_reset_usage(contacts_h contact, int person_id, contacts_
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -293,13 +315,19 @@ int ctsvc_client_person_set_favorite_order(contacts_h contact, int person_id, in
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -365,12 +393,18 @@ int ctsvc_client_person_set_default_property(contacts_h contact, contacts_person
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -431,12 +465,17 @@ int ctsvc_client_person_get_default_property(contacts_h contact, contacts_person
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
-               if (ret == CONTACTS_ERROR_NONE) {
-                       if (id)
-                               *id = *(int*)pims_ipc_data_get(outdata,&size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+               if (ret == CONTACTS_ERROR_NONE && id) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, id)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
diff --git a/client/ctsvc_client_phonelog_helper.c b/client/ctsvc_client_phonelog_helper.c
index 1888f92..5f94a97 100644 (file)
--- a/client/ctsvc_client_phonelog_helper.c
+++ b/client/ctsvc_client_phonelog_helper.c
@@ -70,13 +70,19 @@ int ctsvc_client_phone_log_reset_statistics(contacts_h contact)
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               // check result
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
 
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
@@ -164,12 +170,18 @@ int ctsvc_client_phone_log_delete(contacts_h contact, contacts_phone_log_delete_
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
-
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
                        int transaction_ver = 0;
-                       transaction_ver = *(int*)pims_ipc_data_get(outdata,&size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &transaction_ver)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                        ctsvc_client_ipc_set_change_version(contact, transaction_ver);
                }
 
diff --git a/client/ctsvc_client_setting.c b/client/ctsvc_client_setting.c
index 9498ef5..fc8a8f2 100644 (file)
--- a/client/ctsvc_client_setting.c
+++ b/client/ctsvc_client_setting.c
@@ -42,10 +42,18 @@ API int contacts_setting_get_name_display_order(contacts_name_display_order_e *n
        }
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
+
                if (CONTACTS_ERROR_NONE == ret) {
-                       *name_display_order = *(int*) pims_ipc_data_get(outdata, &size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, (int *)name_display_order)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
@@ -67,10 +75,17 @@ API int contacts_setting_get_name_sorting_order(contacts_name_sorting_order_e *n
        }
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                if (CONTACTS_ERROR_NONE == ret) {
-                       *name_sorting_order = *(int*) pims_ipc_data_get(outdata, &size);
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, (int *)name_sorting_order)) {
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                               pims_ipc_data_destroy(outdata);
+                               return CONTACTS_ERROR_IPC;
+                       }
                }
                pims_ipc_data_destroy(outdata);
        }
@@ -110,8 +125,11 @@ API int contacts_setting_set_name_display_order(contacts_name_display_order_e na
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                pims_ipc_data_destroy(outdata);
        }
 
@@ -150,8 +168,11 @@ API int contacts_setting_set_name_sorting_order(contacts_name_sorting_order_e na
        pims_ipc_data_destroy(indata);
 
        if (outdata) {
-               unsigned int size = 0;
-               ret = *(int*) pims_ipc_data_get(outdata, &size);
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_unmarshal_int(outdata, &ret)) {
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
+                       pims_ipc_data_destroy(outdata);
+                       return CONTACTS_ERROR_IPC;
+               }
                pims_ipc_data_destroy(outdata);
        }
 
diff --git a/server/ctsvc_ipc_server.c b/server/ctsvc_ipc_server.c
index f64c640..790a9d3 100644 (file)
--- a/server/ctsvc_ipc_server.c
+++ b/server/ctsvc_ipc_server.c
@@ -42,12 +42,12 @@ void ctsvc_ipc_server_connect(pims_ipc_h ipc, pims_ipc_data_h indata, pims_ipc_d
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("There is no indata fail");
+               CTS_ERR("There is no indata Fail");
                ret = CONTACTS_ERROR_SYSTEM;
                goto ERROR_RETURN;
        }
@@ -66,14 +66,14 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
 
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -104,13 +104,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -127,17 +127,17 @@ void ctsvc_ipc_server_check_permission(pims_ipc_h ipc, pims_ipc_data_h indata,
 {
        int ret = CONTACTS_ERROR_NONE;
        int permission;
-       bool result;
+       bool result = false;
 
        if (NULL == indata) {
                ret = CONTACTS_ERROR_INVALID_PARAMETER;
-               CTS_ERR("check permission fail.");
+               CTS_ERR("check permission Fail");
                goto ERROR_RETURN;
        }
 
        ret = ctsvc_ipc_unmarshal_int(indata, &permission);
        if (ret != CONTACTS_ERROR_NONE) {
-               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                goto ERROR_RETURN;
        }
 
@@ -146,22 +146,22 @@ void ctsvc_ipc_server_check_permission(pims_ipc_h ipc, pims_ipc_data_h indata,
 ERROR_RETURN:
        *outdata = pims_ipc_data_create(0);
        if (NULL == *outdata) {
-               CTS_ERR("pims_ipc_data_create fail");
+               CTS_ERR("pims_ipc_data_create() Fail");
                return;
        }
 
-       if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+       if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                pims_ipc_data_destroy(*outdata);
                *outdata = NULL;
-               CTS_ERR("pims_ipc_data_put fail (return value)");
+               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                return;
        }
 
        if (ret == CONTACTS_ERROR_NONE) {
-               if (pims_ipc_data_put(*outdata, (void*)&result, sizeof(bool)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_bool(result, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (id)");
+                       CTS_ERR("ctsvc_ipc_marshal_bool() Fail");
                        return;
                }
        }
@@ -184,13 +184,13 @@ void ctsvc_ipc_server_db_insert_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
 
                ret = ctsvc_ipc_unmarshal_record(indata,&record);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        record = NULL;
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -204,13 +204,13 @@ void ctsvc_ipc_server_db_insert_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -218,13 +218,13 @@ void ctsvc_ipc_server_db_insert_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
                        if (ctsvc_ipc_marshal_int(id,*outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
-                               CTS_ERR("ctsvc_ipc_marshal fail");
+                               CTS_ERR("ctsvc_ipc_marshal Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -239,13 +239,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -277,17 +277,17 @@ void ctsvc_ipc_server_db_get_record(pims_ipc_h ipc, pims_ipc_data_h indata, pims
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_string fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_string Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -302,13 +302,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -319,7 +319,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_record(record, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_record fail");
+                               CTS_ERR("ctsvc_ipc_marshal_record Fail");
                                goto DATA_FREE;
                        }
                }
@@ -349,12 +349,12 @@ void ctsvc_ipc_server_db_update_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
                }
                ret = ctsvc_ipc_unmarshal_record(indata,&record);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -368,13 +368,13 @@ void ctsvc_ipc_server_db_update_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -383,7 +383,7 @@ void ctsvc_ipc_server_db_update_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -396,13 +396,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -432,17 +432,17 @@ void ctsvc_ipc_server_db_delete_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -456,13 +456,13 @@ void ctsvc_ipc_server_db_delete_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -471,7 +471,7 @@ void ctsvc_ipc_server_db_delete_record(pims_ipc_h ipc, pims_ipc_data_h indata, p
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -484,13 +484,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -523,18 +523,18 @@ void ctsvc_ipc_server_db_replace_record(pims_ipc_h ipc, pims_ipc_data_h indata,
 
                ret = ctsvc_ipc_unmarshal_record(indata, &record);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        record = NULL;
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_replace_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_replace_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -549,13 +549,14 @@ void ctsvc_ipc_server_db_replace_record(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -564,7 +565,7 @@ void ctsvc_ipc_server_db_replace_record(pims_ipc_h ipc, pims_ipc_data_h indata,
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -579,13 +580,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -619,22 +620,22 @@ void ctsvc_ipc_server_db_get_all_records(pims_ipc_h ipc, pims_ipc_data_h indata,
 
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&offset);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&limit);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -648,13 +649,13 @@ void ctsvc_ipc_server_db_get_all_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -665,7 +666,7 @@ void ctsvc_ipc_server_db_get_all_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                        ret = ctsvc_ipc_marshal_list(list,*outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -681,13 +682,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -713,28 +714,28 @@ void ctsvc_ipc_server_db_get_records_with_query(pims_ipc_h ipc, pims_ipc_data_h
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_query(indata,&query);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&offset);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&limit);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -748,13 +749,13 @@ void ctsvc_ipc_server_db_get_records_with_query(pims_ipc_h ipc, pims_ipc_data_h
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -765,7 +766,7 @@ void ctsvc_ipc_server_db_get_records_with_query(pims_ipc_h ipc, pims_ipc_data_h
                        ret = ctsvc_ipc_marshal_list(list,*outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -779,13 +780,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -810,18 +811,18 @@ void ctsvc_ipc_server_db_get_count(pims_ipc_h ipc, pims_ipc_data_h indata, pims_
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -835,13 +836,13 @@ void ctsvc_ipc_server_db_get_count(pims_ipc_h ipc, pims_ipc_data_h indata, pims_
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -852,7 +853,7 @@ void ctsvc_ipc_server_db_get_count(pims_ipc_h ipc, pims_ipc_data_h indata, pims_
                        ret = ctsvc_ipc_marshal_int(count,*outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -866,13 +867,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -895,18 +896,18 @@ void ctsvc_ipc_server_db_get_count_with_query(pims_ipc_h ipc, pims_ipc_data_h in
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_query(indata,&query);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -920,13 +921,13 @@ void ctsvc_ipc_server_db_get_count_with_query(pims_ipc_h ipc, pims_ipc_data_h in
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -937,7 +938,7 @@ void ctsvc_ipc_server_db_get_count_with_query(pims_ipc_h ipc, pims_ipc_data_h in
                        ret = ctsvc_ipc_marshal_int(count,*outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -951,13 +952,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -983,18 +984,18 @@ void ctsvc_ipc_server_db_insert_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_list(indata,&list);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_list fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_list Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -1021,13 +1022,13 @@ void ctsvc_ipc_server_db_insert_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1036,26 +1037,26 @@ void ctsvc_ipc_server_db_insert_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
                        /* marshal : id_count+property_id+[ids]*id_count */
                        /* id_count */
-                       if (pims_ipc_data_put(*outdata,(void*)&id_count,sizeof(int)) != 0) {
+                       if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(id_count, *outdata)) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("pims_ipc_data_put fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
 
                        for (i=0;i<id_count;i++) {
                                /* marshal ids */
-                               if (pims_ipc_data_put(*outdata,(void*)&ids[i],sizeof(int)) != 0) {
+                               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ids[i], *outdata)) {
                                        pims_ipc_data_destroy(*outdata);
                                        *outdata = NULL;
-                                       CTS_ERR("pims_ipc_data_put fail");
+                                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                        ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                        goto ERROR_RETURN;
                                }
@@ -1071,13 +1072,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1101,18 +1102,18 @@ void ctsvc_ipc_server_db_update_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_list(indata,&list);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_list fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_list Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -1139,13 +1140,13 @@ void ctsvc_ipc_server_db_update_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1154,7 +1155,7 @@ void ctsvc_ipc_server_db_update_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -1169,13 +1170,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1201,18 +1202,18 @@ void ctsvc_ipc_server_db_delete_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_string(indata,&uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_string fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_string Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&count);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                if (count <=0) {
@@ -1223,13 +1224,13 @@ void ctsvc_ipc_server_db_delete_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                for (i=0;i<count;i++) {
                        ret = ctsvc_ipc_unmarshal_int(indata,&ids[i]);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto ERROR_RETURN;
                        }
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -1243,12 +1244,12 @@ void ctsvc_ipc_server_db_delete_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1257,7 +1258,7 @@ void ctsvc_ipc_server_db_delete_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -1273,13 +1274,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1306,19 +1307,19 @@ void ctsvc_ipc_server_db_replace_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_list(indata, &list);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_list fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_list Fail");
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_int(indata, &count);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
 
@@ -1331,13 +1332,13 @@ void ctsvc_ipc_server_db_replace_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                for (i=0;i<count;i++) {
                        ret = ctsvc_ipc_unmarshal_int(indata, &ids[i]);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto ERROR_RETURN;
                        }
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_repalce_records fail");
+               CTS_ERR("ctsvc_ipc_server_db_repalce_records Fail");
                goto ERROR_RETURN;
        }
 
@@ -1364,13 +1365,13 @@ void ctsvc_ipc_server_db_replace_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -1378,7 +1379,7 @@ void ctsvc_ipc_server_db_replace_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
                                goto ERROR_RETURN;
                        }
@@ -1393,13 +1394,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1426,28 +1427,28 @@ void ctsvc_ipc_server_db_get_changes_by_version(pims_ipc_h ipc, pims_ipc_data_h
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
 
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_string fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_string Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &address_book_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&contacts_db_version);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -1461,13 +1462,13 @@ void ctsvc_ipc_server_db_get_changes_by_version(pims_ipc_h ipc, pims_ipc_data_h
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1477,7 +1478,7 @@ void ctsvc_ipc_server_db_get_changes_by_version(pims_ipc_h ipc, pims_ipc_data_h
                else if (CONTACTS_ERROR_NONE == ret) {
                        ret = ctsvc_ipc_marshal_list(record_list,*outdata);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_marshal_list fail");
+                               CTS_ERR("ctsvc_ipc_marshal_list Fail");
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
@@ -1485,7 +1486,7 @@ void ctsvc_ipc_server_db_get_changes_by_version(pims_ipc_h ipc, pims_ipc_data_h
                        }
                        ret = ctsvc_ipc_marshal_int(current_contacts_db_version,*outdata);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
                                ret = CONTACTS_ERROR_OUT_OF_MEMORY;
@@ -1502,13 +1503,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1531,7 +1532,7 @@ void ctsvc_ipc_server_db_get_current_version(pims_ipc_h ipc, pims_ipc_data_h ind
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
        }
@@ -1548,13 +1549,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1564,7 +1565,7 @@ ERROR_RETURN:
                else if (CONTACTS_ERROR_NONE == ret) {
                        ret = ctsvc_ipc_marshal_int(contacts_db_version,*outdata);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -1591,32 +1592,32 @@ void ctsvc_ipc_server_db_search_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&keyword);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&offset);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&limit);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -1630,13 +1631,13 @@ void ctsvc_ipc_server_db_search_records(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1647,7 +1648,7 @@ void ctsvc_ipc_server_db_search_records(pims_ipc_h ipc, pims_ipc_data_h indata,
                        ret = ctsvc_ipc_marshal_list(list,*outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -1661,13 +1662,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1696,37 +1697,37 @@ void ctsvc_ipc_server_db_search_records_with_range(pims_ipc_h ipc, pims_ipc_data
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&view_uri);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&keyword);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&offset);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&limit);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&range);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record() Fail");
                goto ERROR_RETURN;
        }
 
@@ -1740,13 +1741,13 @@ void ctsvc_ipc_server_db_search_records_with_range(pims_ipc_h ipc, pims_ipc_data
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1757,7 +1758,7 @@ void ctsvc_ipc_server_db_search_records_with_range(pims_ipc_h ipc, pims_ipc_data
                        ret = ctsvc_ipc_marshal_list(list,*outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -1771,13 +1772,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1806,32 +1807,32 @@ void ctsvc_ipc_server_db_search_records_with_query(pims_ipc_h ipc, pims_ipc_data
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_query(indata,&query);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_string(indata,&keyword);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_record fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_record() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&offset);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata,&limit);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record Fail");
                goto ERROR_RETURN;
        }
 
@@ -1847,13 +1848,13 @@ void ctsvc_ipc_server_db_search_records_with_query(pims_ipc_h ipc, pims_ipc_data
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -1861,10 +1862,10 @@ void ctsvc_ipc_server_db_search_records_with_query(pims_ipc_h ipc, pims_ipc_data
                        CTS_DBG("no data");
                }
                else if (CONTACTS_ERROR_NONE == ret) {
-                       ret = ctsvc_ipc_marshal_list(list,*outdata);
+                       ret = ctsvc_ipc_marshal_list(list, *outdata);
 
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_list Fail");
                                goto DATA_FREE;
                        }
                }
@@ -1878,13 +1879,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata,(void*)&ret,sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
@@ -1909,7 +1910,7 @@ void ctsvc_ipc_server_db_get_status(pims_ipc_h ipc, pims_ipc_data_h indata,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_handle(indata, &contact);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_handle Fail(%d)", ret);
+                       CTS_ERR("ctsvc_ipc_unmarshal_handle() Fail(%d)", ret);
                        goto ERROR_RETURN;
                }
        }
@@ -1920,21 +1921,21 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
 
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (return value)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
-               if (pims_ipc_data_put(*outdata, (void*)&status, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(status, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (id)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
        }
diff --git a/server/ctsvc_ipc_server2.c b/server/ctsvc_ipc_server2.c
index 6685cb6..63060e5 100644 (file)
--- a/server/ctsvc_ipc_server2.c
+++ b/server/ctsvc_ipc_server2.c
@@ -55,12 +55,12 @@ void ctsvc_ipc_activity_delete_by_contact_id(pims_ipc_h ipc, pims_ipc_data_h ind
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &contact_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_server_db_insert_record fail");
+               CTS_ERR("ctsvc_ipc_server_db_insert_record() Fail");
                goto ERROR_RETURN;
        }
 
@@ -76,13 +76,14 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -91,7 +92,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -118,12 +119,12 @@ void ctsvc_ipc_activity_delete_by_account_id(pims_ipc_h ipc, pims_ipc_data_h ind
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &account_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_activity_delete_by_account_id fail");
+               CTS_ERR("ctsvc_ipc_activity_delete_by_account_id() Fail");
                goto ERROR_RETURN;
        }
 
@@ -138,13 +139,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -153,7 +154,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -181,17 +182,17 @@ void ctsvc_ipc_group_add_contact(pims_ipc_h ipc, pims_ipc_data_h indata, pims_ip
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &group_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &contact_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_group_add_contact fail");
+               CTS_ERR("ctsvc_ipc_group_add_contact() Fail");
                goto ERROR_RETURN;
        }
 
@@ -207,13 +208,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -222,7 +223,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -250,17 +251,17 @@ void ctsvc_ipc_group_remove_contact(pims_ipc_h ipc, pims_ipc_data_h indata, pims
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &group_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &contact_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_group_remove_contact fail");
+               CTS_ERR("ctsvc_ipc_group_remove_contact() Fail");
                goto ERROR_RETURN;
        }
 
@@ -277,13 +278,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -291,7 +292,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -321,22 +322,22 @@ void ctsvc_ipc_group_set_group_order(pims_ipc_h ipc, pims_ipc_data_h indata, pim
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &group_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &previous_group_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &next_group_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_group_link_group fail");
+               CTS_ERR("ctsvc_ipc_group_link_group() Fail");
                goto ERROR_RETURN;
        }
 
@@ -352,13 +353,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -366,7 +367,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -394,17 +395,17 @@ void ctsvc_ipc_person_link_person(pims_ipc_h ipc, pims_ipc_data_h indata, pims_i
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &base_person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_link_person fail");
+               CTS_ERR("ctsvc_ipc_person_link_person() Fail");
                goto ERROR_RETURN;
        }
 
@@ -420,13 +421,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -434,7 +435,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -461,17 +462,17 @@ void ctsvc_ipc_person_unlink_contact(pims_ipc_h ipc, pims_ipc_data_h indata, pim
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &contact_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_link_person fail");
+               CTS_ERR("ctsvc_ipc_person_link_person() Fail");
                goto ERROR_RETURN;
        }
 
@@ -488,13 +489,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -502,14 +503,14 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
-               if (pims_ipc_data_put(*outdata, (void*)&unlinked_person_id, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(unlinked_person_id, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
 
@@ -536,19 +537,19 @@ void ctsvc_ipc_person_reset_usage(pims_ipc_h ipc, pims_ipc_data_h indata, pims_i
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                int temp = 0;
                ret = ctsvc_ipc_unmarshal_int(indata, &temp);
                type = (int)temp;
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_link_person fail");
+               CTS_ERR("ctsvc_ipc_person_link_person() Fail");
                goto ERROR_RETURN;
        }
 
@@ -564,13 +565,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -578,7 +579,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -606,22 +607,22 @@ void ctsvc_ipc_person_set_favorite_order(pims_ipc_h ipc, pims_ipc_data_h indata,
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &previous_person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &next_person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_link_person fail");
+               CTS_ERR("ctsvc_ipc_person_link_person() Fail");
                goto ERROR_RETURN;
        }
 
@@ -637,13 +638,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -651,7 +652,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -680,22 +681,22 @@ void ctsvc_ipc_person_set_default_property(pims_ipc_h ipc, pims_ipc_data_h indat
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_unsigned_int(indata, &property);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_set_default_property fail");
+               CTS_ERR("ctsvc_ipc_person_set_default_property() Fail");
                goto ERROR_RETURN;
        }
 
@@ -706,13 +707,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -720,7 +721,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -749,17 +750,17 @@ void ctsvc_ipc_person_get_default_property(pims_ipc_h ipc, pims_ipc_data_h indat
                }
                ret = ctsvc_ipc_unmarshal_int(indata, &person_id);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
                ret = ctsvc_ipc_unmarshal_unsigned_int(indata, &op);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_get_default_property fail");
+               CTS_ERR("ctsvc_ipc_person_get_default_property() Fail");
                goto ERROR_RETURN;
        }
 
@@ -775,19 +776,19 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (return value)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail (return value)");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&id, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(id, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (id)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail (id)");
                        goto DATA_FREE;
                }
        }
@@ -824,13 +825,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -838,7 +839,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -868,7 +869,7 @@ void ctsvc_ipc_phone_log_delete(pims_ipc_h ipc, pims_ipc_data_h indata,
                }
                ret = ctsvc_ipc_unmarshal_int(indata, (int*)&op);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
        if (!ctsvc_have_permission(ipc, CTSVC_PERMISSION_PHONELOG_WRITE)) {
                ret = CONTACTS_ERROR_PERMISSION_DENIED;
@@ -881,7 +882,7 @@ void ctsvc_ipc_phone_log_delete(pims_ipc_h ipc, pims_ipc_data_h indata,
                case CONTACTS_PHONE_LOG_DELETE_BY_ADDRESS:
                        ret = ctsvc_ipc_unmarshal_string(indata, &number);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_string fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_string() Fail");
                                goto ERROR_RETURN;
                        }
                        ret = ctsvc_phone_log_delete(op, number);
@@ -890,7 +891,7 @@ void ctsvc_ipc_phone_log_delete(pims_ipc_h ipc, pims_ipc_data_h indata,
                case CONTACTS_PHONE_LOG_DELETE_BY_EMAIL_EXTRA_DATA1:
                        ret = ctsvc_ipc_unmarshal_int(indata, &extra_data1);
                        if (ret != CONTACTS_ERROR_NONE) {
-                               CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                               CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                                goto ERROR_RETURN;
                        }
                        ret = ctsvc_phone_log_delete(op, extra_data1);
@@ -906,13 +907,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        goto DATA_FREE;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        goto DATA_FREE;
                }
                if (ret == CONTACTS_ERROR_NONE) {
@@ -920,7 +921,7 @@ ERROR_RETURN:
                        if (ctsvc_ipc_marshal_int(transaction_ver, *outdata) != CONTACTS_ERROR_NONE) {
                                pims_ipc_data_destroy(*outdata);
                                *outdata = NULL;
-                               CTS_ERR("ctsvc_ipc_marshal_int fail");
+                               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                                goto DATA_FREE;
                        }
                }
@@ -950,19 +951,19 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        return;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (return value)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail (return value)");
                        return;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&order, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(order, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (id)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail (id)");
                        return;
                }
        }
@@ -990,19 +991,19 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        return;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (return value)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail (return value)");
                        return;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&order, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(order, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail (id)");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail (id)");
                        return;
                }
        }
@@ -1022,12 +1023,12 @@ void ctsvc_ipc_setting_set_name_display_order(pims_ipc_h ipc,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_int(indata, &order);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_set_default_property fail");
+               CTS_ERR("ctsvc_ipc_person_set_default_property() Fail");
                goto ERROR_RETURN;
        }
 
@@ -1042,13 +1043,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        return;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        return;
                }
        }
@@ -1068,12 +1069,12 @@ void ctsvc_ipc_setting_set_name_sorting_order(pims_ipc_h ipc,
        if (indata) {
                ret = ctsvc_ipc_unmarshal_int(indata, &order);
                if (ret != CONTACTS_ERROR_NONE) {
-                       CTS_ERR("ctsvc_ipc_unmarshal_int fail");
+                       CTS_ERR("ctsvc_ipc_unmarshal_int() Fail");
                        goto ERROR_RETURN;
                }
        }
        else {
-               CTS_ERR("ctsvc_ipc_person_set_default_property fail");
+               CTS_ERR("ctsvc_ipc_person_set_default_property() Fail");
                goto ERROR_RETURN;
        }
 
@@ -1088,13 +1089,13 @@ ERROR_RETURN:
        if (outdata) {
                *outdata = pims_ipc_data_create(0);
                if (NULL == *outdata) {
-                       CTS_ERR("pims_ipc_data_create fail");
+                       CTS_ERR("pims_ipc_data_create() Fail");
                        return;
                }
-               if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) {
+               if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(ret, *outdata)) {
                        pims_ipc_data_destroy(*outdata);
                        *outdata = NULL;
-                       CTS_ERR("pims_ipc_data_put fail");
+                       CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                        return;
                }
        }
diff --git a/server/ctsvc_server_change_subject.c b/server/ctsvc_server_change_subject.c
index ec709c5..a865d7c 100644 (file)
--- a/server/ctsvc_server_change_subject.c
+++ b/server/ctsvc_server_change_subject.c
@@ -48,8 +48,8 @@ static gboolean __ctsvc_publish_changes_with_data(const char *view_uri, char *da
                return false;
        }
 
-       if (pims_ipc_data_put(indata, data, strlen(data) + 1) != 0) {
-               CTS_ERR("pims_ipc_data_put error\n");
+       if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_string(data, indata)) {
+               CTS_ERR("ctsvc_ipc_marshal_string() Fail");
                pims_ipc_data_destroy(indata);
                return false;
        }
@@ -139,10 +139,10 @@ void ctsvc_change_subject_publish_setting(const char *setting_id, int value)
 {
        pims_ipc_data_h indata = NULL;
        indata = pims_ipc_data_create(0);
-       RETM_IF(NULL == indata, "pims_ipc_data_create error");
+       RETM_IF(NULL == indata, "pims_ipc_data_create() Fail");
 
-       if (pims_ipc_data_put(indata, (void*)&value, sizeof(int)) != 0) {
-               CTS_ERR("pims_ipc_data_put error");
+       if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(value, indata)) {
+               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                pims_ipc_data_destroy(indata);
                return;
        }
@@ -157,10 +157,10 @@ void ctsvc_change_subject_publish_status(contacts_db_status_e status)
 {
        pims_ipc_data_h indata = NULL;
        indata = pims_ipc_data_create(0);
-       RETM_IF(NULL == indata, "pims_ipc_data_create error");
+       RETM_IF(NULL == indata, "pims_ipc_data_create() Fail");
 
-       if (pims_ipc_data_put(indata, (void*)&status, sizeof(int)) != 0) {
-               CTS_ERR("pims_ipc_data_put error");
+       if (CONTACTS_ERROR_NONE != ctsvc_ipc_marshal_int(status, indata)) {
+               CTS_ERR("ctsvc_ipc_marshal_int() Fail");
                pims_ipc_data_destroy(indata);
                return;
        }
Domain: Service Framework / PIMS;