Apply comments

Change-Id: I60669f9a6565475fef2bdc85268e3a2a5cb2dcec

diff --git a/native/ctsvc_localize_jp.c b/native/ctsvc_localize_jp.c
index a66f399..66ad67c 100644 (file)
--- a/native/ctsvc_localize_jp.c
+++ b/native/ctsvc_localize_jp.c
@@ -167,10 +167,9 @@ int ctsvc_convert_japanese_to_hiragana(const char *src, char **dest)
        }
 
        result = calloc(1, sizeof(UChar) * (size + 1));
-       if (NULL == tmp_result) {
+       if (NULL == result) {
                CTS_ERR("calloc() Fail");
                free(tmp_result);
-               free(result);
                return CONTACTS_ERROR_OUT_OF_MEMORY;
        }
 

diff --git a/server/ctsvc_server_sim.c b/server/ctsvc_server_sim.c
index 4ff837c..de4604d 100644 (file)
--- a/server/ctsvc_server_sim.c
+++ b/server/ctsvc_server_sim.c
@@ -461,20 +461,12 @@ static void __ctsvc_server_sim_import_contact_cb(TapiHandle *handle, int result,
                CTS_DBG("NextIndex = %d", sim_info->next_index);
                ret = tel_read_sim_pb_record(__ctsvc_server_sim_get_tapi_handle(info), sim_info->phonebook_type,
                                sim_info->next_index, __ctsvc_server_sim_import_contact_cb, NULL);
-               if (TAPI_API_SUCCESS != ret) {
-                       CTS_ERR("tel_read_sim_pb_record() Fail(%d)", ret);
-                       ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
-                       WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
-                       __ctsvc_server_sim_set_return_data(NULL);
-                       return;
-               }
+
+               WARN_IF(TAPI_API_SUCCESS != ret, "tel_read_sim_pb_record() Fail(%d)", ret);
        }
        else {
                // insert imported contact to DB
                __ctsvc_server_sim_insert_records_to_db(info);
-               ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
-               WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
-               __ctsvc_server_sim_set_return_data(NULL);
        }
 
        ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
@@ -645,6 +637,7 @@ static int __ctsvc_server_sim_sdn_read(ctsvc_sim_info_s* info)
        }
        else {
                CTS_ERR("sim_status Fail(%d)", sim_status);
+               return CONTACTS_ERROR_SYSTEM;
        }
 
        return CONTACTS_ERROR_NONE;