Apply coding idiom guide (2)

Change-Id: Ifcb0b6f9ad43ba70b3c875993afc677a72b3cc30
Signed-off-by: MyoungHoon Chae <mhoon.chae@samsung.com>

diff --git a/client/ctsvc_client_db.c b/client/ctsvc_client_db.c
index 70b85c5..acc4f71 100644 (file)
--- a/client/ctsvc_client_db.c
+++ b/client/ctsvc_client_db.c
@@ -101,7 +101,7 @@ API int contacts_db_insert_record(contacts_record_h record, int *id)
        return ret;
 }
 
-API int        contacts_db_get_record(const char* view_uri, int id, contacts_record_h* out_record)
+API int contacts_db_get_record(const char* view_uri, int id, contacts_record_h* out_record)
 {
        int ret = CONTACTS_ERROR_NONE;
        pims_ipc_data_h indata = NULL;

diff --git a/common/ctsvc_inotify.c b/common/ctsvc_inotify.c
index a3f105a..bbc5923 100755 (executable)
--- a/common/ctsvc_inotify.c
+++ b/common/ctsvc_inotify.c
@@ -334,7 +334,7 @@ static inline int __ctsvc_del_noti(GSList **noti_list, int wd,
                        if (cb == noti->cb && user_data == noti->cb_data
                                && 0 == strcmp(noti->view_uri, view_uri)) {
                                it = it->next;
-                               result = g_slist_remove(result , noti);
+                               result = g_slist_remove(result, noti);
                                free(noti->view_uri);
                                free(noti);
                                del_cnt++;

diff --git a/common/ctsvc_record.c b/common/ctsvc_record.c
index d77d18b..359d8ee 100755 (executable)
--- a/common/ctsvc_record.c
+++ b/common/ctsvc_record.c
@@ -408,7 +408,7 @@ API int contacts_record_get_bool(contacts_record_h record, unsigned int property
        __INVALID_PARAMETER_ERROR_HANDLING();
 }
 
-API int        contacts_record_set_bool(contacts_record_h record, unsigned int property_id, bool value)
+API int contacts_record_set_bool(contacts_record_h record, unsigned int property_id, bool value)
 {
        RETV_IF(NULL == record, CONTACTS_ERROR_INVALID_PARAMETER);
 
@@ -519,7 +519,7 @@ int ctsvc_record_set_double(contacts_record_h record, unsigned int property_id,
 }
 
 // Record get/set child records
-API int        contacts_record_add_child_record(contacts_record_h record,
+API int contacts_record_add_child_record(contacts_record_h record,
                unsigned int property_id, contacts_record_h child_record)
 {
        ctsvc_record_s *s_record;
@@ -534,7 +534,7 @@ API int     contacts_record_add_child_record(contacts_record_h record,
        __INVALID_PARAMETER_ERROR_HANDLING();
 }
 
-API int        contacts_record_remove_child_record(contacts_record_h record,
+API int contacts_record_remove_child_record(contacts_record_h record,
                unsigned int property_id, contacts_record_h child_record)
 {
        ctsvc_record_s *s_record;

diff --git a/common/ctsvc_record_contact.c b/common/ctsvc_record_contact.c
index e1ac4d2..16f86e3 100755 (executable)
--- a/common/ctsvc_record_contact.c
+++ b/common/ctsvc_record_contact.c
@@ -1969,7 +1969,7 @@ static int __ctsvc_url_set_int(contacts_record_h record, unsigned int property_i
                break;
        case CTSVC_PROPERTY_URL_TYPE:
                RETVM_IF(value < CONTACTS_URL_TYPE_OTHER
-                                               || value > CONTACTS_URL_TYPE_WORK ,
+                                               || value > CONTACTS_URL_TYPE_WORK,
                                CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter : url type is in invalid range (%d)", value);
 
                url->type = value;

diff --git a/common/ctsvc_struct.h b/common/ctsvc_struct.h
index dad430c..e7f9dcc 100644 (file)
--- a/common/ctsvc_struct.h
+++ b/common/ctsvc_struct.h
@@ -439,7 +439,7 @@ typedef struct {
        int id;
        int activity_id;
        char *photo_url;
-       int     sort_index;
+       int sort_index;
 }ctsvc_activity_photo_s;
 
 typedef struct {

diff --git a/common/ctsvc_vcard.c b/common/ctsvc_vcard.c
index 07cbd01..0abd95e 100644 (file)
--- a/common/ctsvc_vcard.c
+++ b/common/ctsvc_vcard.c
@@ -2584,7 +2584,7 @@ static inline int __ctsvc_vcard_get_photo(contacts_record_h contact, ctsvc_list_
        contacts_record_h image;
        struct timeval tv;
 
-       temp = strchr(val , ':');
+       temp = strchr(val, ':');
        RETVM_IF(NULL == temp, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter : val is invalid");
 
        *temp = '\0';
@@ -2832,7 +2832,7 @@ static inline int __ctsvc_vcard_get_company_logo(ctsvc_list_s *company_list, cha
                contacts_list_add((contacts_list_h)company_list, company);
        }
 
-       temp = strchr(val , ':');
+       temp = strchr(val, ':');
        RETVM_IF(NULL == temp, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter : val is invalid");
 
        *temp = '\0';

diff --git a/native/ctsvc_db_plugin_contact.c b/native/ctsvc_db_plugin_contact.c
index e77369b..06401da 100644 (file)
--- a/native/ctsvc_db_plugin_contact.c
+++ b/native/ctsvc_db_plugin_contact.c
@@ -1975,7 +1975,7 @@ static int __ctsvc_db_contact_insert_record(contacts_record_h record, int *id)
        }
        else if (auto_link_enabled) {
                ret = __ctsvc_find_person_to_link((contacts_record_h)contact, contact->addressbook_id, &person_id);
-               CTS_DBG("__ctsvc_find_person_to_link return %d , person_id(%d)", ret, person_id);
+               CTS_DBG("__ctsvc_find_person_to_link return %d, person_id(%d)", ret, person_id);
                if (ret == CONTACTS_ERROR_NONE && person_id > 0) {
                        contact->person_id = person_id;
                        auto_linked = true;
@@ -2238,7 +2238,7 @@ static int __ctsvc_db_contact_replace_record(contacts_record_h record, int conta
 
        len = snprintf(query, sizeof(query),
                        "UPDATE "CTS_TABLE_CONTACTS" SET changed_ver=%d, changed_time=%d, is_favorite=%d, "
-                                       "has_phonenumber=%d, has_email=%d , display_name=?, "
+                                       "has_phonenumber=%d, has_email=%d, display_name=?, "
                                        "reverse_display_name=?, display_name_source=%d, "
                                        "display_name_language=%d, reverse_display_name_language=%d, "
                                        "sort_name=?, reverse_sort_name=?, "

diff --git a/native/ctsvc_db_plugin_contact_helper.c b/native/ctsvc_db_plugin_contact_helper.c
index 926739d..f91e7ed 100644 (file)
--- a/native/ctsvc_db_plugin_contact_helper.c
+++ b/native/ctsvc_db_plugin_contact_helper.c
@@ -1060,7 +1060,7 @@ void ctsvc_contact_make_display_name(ctsvc_contact_s *contact)
                        display_len = SAFE_STRLEN(name->prefix) + temp_display_len + 2;
                        display = calloc(1, display_len);
                        char * temp = __ctsvc_remove_first_space(name->prefix);
-                       snprintf(display, display_len , "%s %s", temp, temp_display);
+                       snprintf(display, display_len, "%s %s", temp, temp_display);
                        free(temp);
                        contact->reverse_display_name = display;
                        contact->reverse_sort_name = temp_display;
@@ -1140,7 +1140,7 @@ void ctsvc_contact_make_display_name(ctsvc_contact_s *contact)
                        if (name->prefix && temp_display) {
                                display_len = SAFE_STRLEN(name->prefix) + temp_display_len + 2;
                                display = calloc(1, display_len);
-                               snprintf(display, display_len , "%s %s", name->prefix, temp_display);
+                               snprintf(display, display_len, "%s %s", name->prefix, temp_display);
                                contact->display_name = display;
                                contact->sort_name = temp_display;
                        }

diff --git a/native/ctsvc_db_plugin_my_profile.c b/native/ctsvc_db_plugin_my_profile.c
index fef0106..d4d1241 100644 (file)
--- a/native/ctsvc_db_plugin_my_profile.c
+++ b/native/ctsvc_db_plugin_my_profile.c
@@ -522,7 +522,7 @@ static void __ctsvc_make_my_profile_display_name(ctsvc_my_profile_s *my_profile)
                if (name->prefix && temp_display) {
                        display_len = SAFE_STRLEN(name->prefix) + temp_display_len + 2;
                        display = calloc(1, display_len);
-                       snprintf(display, display_len , "%s %s", name->prefix, temp_display);
+                       snprintf(display, display_len, "%s %s", name->prefix, temp_display);
                        my_profile->reverse_display_name = display;
                        free(temp_display);
                }
@@ -590,7 +590,7 @@ static void __ctsvc_make_my_profile_display_name(ctsvc_my_profile_s *my_profile)
                        if (name->prefix && temp_display) {
                                display_len = SAFE_STRLEN(name->prefix) + temp_display_len + 2;
                                display = calloc(1, display_len);
-                               snprintf(display, display_len , "%s %s", name->prefix, temp_display);
+                               snprintf(display, display_len, "%s %s", name->prefix, temp_display);
                                my_profile->display_name = display;
                                free(temp_display);
                        }

diff --git a/native/ctsvc_db_query.c b/native/ctsvc_db_query.c
index 46aeb51..6261b5f 100644 (file)
--- a/native/ctsvc_db_query.c
+++ b/native/ctsvc_db_query.c
@@ -1748,7 +1748,7 @@ static int __ctsvc_db_search_records_append_sort(const char *view_uri,
                        if (temp_len >= 0) len+= temp_len;
                                free(temp_keyword);
                }
-               temp_len = SAFE_SNPRINTF(query, query_size, len, " , ");
+               temp_len = SAFE_SNPRINTF(query, query_size, len, ", ");
                if (temp_len >= 0) len+= temp_len;
                temp_len = SAFE_SNPRINTF(query, query_size, len, sortkey);
                if (temp_len >= 0) len+= temp_len;
@@ -2015,7 +2015,7 @@ static int __ctsvc_db_search_records_exec(const char *view_uri, const property_i
                sortkey = ctsvc_get_sort_column();
 
        if (sortkey) {
-               len = __ctsvc_db_search_records_append_sort(view_uri, sortkey, keyword, len , &query, &query_size);
+               len = __ctsvc_db_search_records_append_sort(view_uri, sortkey, keyword, len, &query, &query_size);
        }
        else if (0 == strcmp(view_uri, CTSVC_VIEW_URI_GROUP)) {
                temp_len = SAFE_SNPRINTF(&query, &query_size, len, " ORDER BY group_prio");
@@ -2587,7 +2587,7 @@ static int __ctsvc_db_get_count_exec(const char *view_uri, const property_info_s
        len += snprintf(query+len, sizeof(query)-len, ") ");
 
        ret = ctsvc_query_get_first_int_result(query, out_count);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
 
        return ret;
 }
@@ -2669,12 +2669,12 @@ static int __ctsvc_db_get_count_with_query_exec(ctsvc_query_s *s_query, const ch
                for (cursor=bind_text, i=1; cursor;cursor=cursor->next, i++)
                        ctsvc_stmt_bind_copy_text(stmt, i, cursor->data, strlen(cursor->data));
                ret = ctsvc_stmt_get_first_int_result(stmt, out_count);
-               RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_stmt_get_first_int_result() Failed(%d)", ret);
+               RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_stmt_get_first_int_result() Failed(%d)", ret);
        }
        else {
                ret = ctsvc_query_get_first_int_result(query, out_count);
                free(query);
-               RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+               RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
        }
        return ret;
 }
@@ -2783,7 +2783,7 @@ static int __ctsvc_db_get_contact_changes(const char* view_uri, int addressbook_
                                                "AND "CTS_TABLE_CONTACTS".addressbook_id = "CTS_TABLE_ADDRESSBOOKS".addressbook_id",
                        CONTACTS_CHANGE_UPDATED, version,
                        CONTACTS_CHANGE_DELETED, version, version,
-                       CONTACTS_CHANGE_DELETED, version ,version);
+                       CONTACTS_CHANGE_DELETED, version,version);
        }
 
        ret = ctsvc_query_prepare(query, &stmt);
@@ -2822,7 +2822,7 @@ static int __ctsvc_db_get_contact_changes(const char* view_uri, int addressbook_
 
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
        *out_list = list;
 
        return CONTACTS_ERROR_NONE;
@@ -2890,7 +2890,7 @@ static int __ctsvc_db_get_group_changes(const char* view_uri, int addressbook_id
 
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
        *out_list = list;
 
        return CONTACTS_ERROR_NONE;
@@ -2948,7 +2948,7 @@ static int __ctsvc_db_get_group_relations_changes(const char* view_uri, int addr
 
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
        *out_list = list;
 
        return CONTACTS_ERROR_NONE;
@@ -2995,7 +2995,7 @@ static int __ctsvc_db_get_group_member_changes(const char* view_uri, int address
 
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
        *out_list = list;
 
        return CONTACTS_ERROR_NONE;
@@ -3062,7 +3062,7 @@ static int __ctsvc_db_get_my_profile_changes(const char* view_uri, int addressbo
 
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
        *out_list = list;
 
        return CONTACTS_ERROR_NONE;

diff --git a/native/ctsvc_group.c b/native/ctsvc_group.c
index cea2858..33ebd87 100644 (file)
--- a/native/ctsvc_group.c
+++ b/native/ctsvc_group.c
@@ -302,10 +302,10 @@ API int contacts_group_set_group_order(int group_id, int previous_group_id, int
 
        RETVM_IF(0.0 == previous_prio && 0.0 == next_prio, CONTACTS_ERROR_INVALID_PARAMETER,
                        "The indexes for previous and next are invalid.");
-       RETVM_IF(previous_group_id && previous_addressbook_id != addressbook_id , CONTACTS_ERROR_INVALID_PARAMETER,
+       RETVM_IF(previous_group_id && previous_addressbook_id != addressbook_id, CONTACTS_ERROR_INVALID_PARAMETER,
                                "previous group(%d) and group(%d) are not the same addressbook(%d, %d) groups",
                                previous_group_id, group_id, previous_addressbook_id, addressbook_id);
-       RETVM_IF(next_group_id && next_addressbook_id != addressbook_id , CONTACTS_ERROR_INVALID_PARAMETER,
+       RETVM_IF(next_group_id && next_addressbook_id != addressbook_id, CONTACTS_ERROR_INVALID_PARAMETER,
                                "next group(%d) and group(%d) are not the same addressbook(%d, %d) groups",
                                next_group_id, group_id, next_addressbook_id, addressbook_id);
 

diff --git a/native/ctsvc_localize_ch.c b/native/ctsvc_localize_ch.c
index 240c29f..5c3d031 100755 (executable)
--- a/native/ctsvc_localize_ch.c
+++ b/native/ctsvc_localize_ch.c
@@ -2133,7 +2133,7 @@ static inline int __ctsvc_get_pinyinspell(UChar src, char spell[CHINESE_DUOYINZI
        int count=0;
 
        offset = src - CHINESE_UNICODE_START;
-       RETVM_IF(offset < 0 || offset >= CHINESE_COUNT , CONTACTS_ERROR_INVALID_PARAMETER, "src is invalid");
+       RETVM_IF(offset < 0 || offset >= CHINESE_COUNT, CONTACTS_ERROR_INVALID_PARAMETER, "src is invalid");
 
        len = strlen(pinyin_spell_table[offset]);
 
@@ -2157,10 +2157,9 @@ static inline bool __ctsvc_is_chinese(const UChar *src)
        return  false;
 }
 
-static inline bool
-__ctsvc_has_chinese(const UChar *src)
+static inline bool __ctsvc_has_chinese(const UChar *src)
 {
-       int     i, len;
+       int i, len;
 
        len = u_strlen(src);
 
@@ -2201,7 +2200,7 @@ bool ctsvc_has_chinese(const char *src)
 int ctsvc_convert_chinese_to_pinyin(const char *src, pinyin_name_s **name, int *size)
 {
        UChar   temp_result[strlen(src)+1];
-       int     count = 0, len=0, total_count=0;
+       int count = 0, len=0, total_count=0;
        int ret, i, j;
        int multi_pinyin_count = 0;
        UErrorCode status = 0;

diff --git a/native/ctsvc_number_utils.c b/native/ctsvc_number_utils.c
index 8ea110c..0e745b1 100644 (file)
--- a/native/ctsvc_number_utils.c
+++ b/native/ctsvc_number_utils.c
@@ -819,7 +819,7 @@ int ctsvc_normalize_number(const char *src, char *dest, int dest_size, bool repl
        return d_pos;
 }
 
-// vaild character : digit, +, *, #, , ;, alphabet(depends on replace_alphabet parameter)
+// vaild character : digit, +, *, #,, ;, alphabet(depends on replace_alphabet parameter)
 // Remove invalid string from number
 int ctsvc_clean_number(const char *src, char *dest, int dest_size, bool replace_alphabet)
 {
@@ -1079,7 +1079,7 @@ static bool __ctsvc_number_compare(const char *number1, const char *number2)
                                && (number1[0] == '0' || (cc && cc[0] == '7' && number1[0] == '8')))
                        return true;
                //////////////////////////////////////////////////
-               // + IP CC XXXXXXXX, + CC XXXXXXXX  (ex. +001 82  11 1234 5678 , +82 10 1234 5678)
+               // + IP CC XXXXXXXX, + CC XXXXXXXX  (ex. +001 82  11 1234 5678, +82 10 1234 5678)
                else if ((CTSVC_PLUS_IP_CC == n1 || CTSVC_IP_CC == n1)
                                && (CTSVC_PLUS_CC_ONLY == n2 || CTSVC_CC_ONLY == n2)) {
                        int p = (CTSVC_PLUS_CC_ONLY == n2)?1:0;
@@ -1095,7 +1095,7 @@ static bool __ctsvc_number_compare(const char *number1, const char *number2)
                                return true;
                }
                ///////////////////////////////////////////////////
-               // + CC XXXXXXXX, + IP CC XXXXXXXX  (ex. +001 82  10 1234 5678 , +82 10 1234 5678)
+               // + CC XXXXXXXX, + IP CC XXXXXXXX  (ex. +001 82  10 1234 5678, +82 10 1234 5678)
                else if ((CTSVC_PLUS_IP_ONLY == n1 || CTSVC_IP_ONLY == n1)
                                && CTSVC_PLUS_ONLY == n2) {
                        return true;

diff --git a/native/ctsvc_person.c b/native/ctsvc_person.c
index f3afb8e..cc8b83e 100644 (file)
--- a/native/ctsvc_person.c
+++ b/native/ctsvc_person.c
@@ -1178,7 +1178,7 @@ API int contacts_person_unlink_contact(int person_id, int contact_id, int* out_p
        bool is_favorite = false;
        double priority = 0.0;
 
-       RETVM_IF(person_id <= 0 || contact_id <= 0 , CONTACTS_ERROR_INVALID_PARAMETER,
+       RETVM_IF(person_id <= 0 || contact_id <= 0, CONTACTS_ERROR_INVALID_PARAMETER,
                "Invalid parameter : person_id(%d), person_id(%d)", person_id, person_id);
 
        if (out_person_id)

diff --git a/native/ctsvc_utils.c b/native/ctsvc_utils.c
index ae74fae..4097aa8 100644 (file)
--- a/native/ctsvc_utils.c
+++ b/native/ctsvc_utils.c
@@ -348,7 +348,7 @@ static bool __ctsvc_image_util_supported_jpeg_colorspace_cb(image_util_colorspac
 
                CTS_DBG("size(%d, %d) -> resize(%d,%d)", width, height, resized_width, resized_height);
 
-               image_util_calculate_buffer_size(resized_width, resized_height, colorspace , &size_decode);
+               image_util_calculate_buffer_size(resized_width, resized_height, colorspace, &size_decode);
 
                img_target = malloc(size_decode);
 

diff --git a/server/ctsvc_server_utils.c b/server/ctsvc_server_utils.c
index efbb2ae..6cf5534 100755 (executable)
--- a/server/ctsvc_server_utils.c
+++ b/server/ctsvc_server_utils.c
@@ -137,7 +137,7 @@ int ctsvc_server_init_configuration(void)
 
        ret = vconf_get_int(ctsvc_get_default_sort_vconfkey(), &sort_type);
        if (ret < 0 || sort_type == CTSVC_SORT_OTHERS) {
-               CTS_ERR("vconf_get_int(%s) Failed(%d)", ctsvc_get_default_sort_vconfkey() ,ret);
+               CTS_ERR("vconf_get_int(%s) Failed(%d)", ctsvc_get_default_sort_vconfkey(),ret);
                sort_type = ctsvc_get_sort_type_from_language(system_language);
                if (sort_type == CTSVC_SORT_OTHERS)
                        sort_type = CTSVC_SORT_WESTERN;