fix build error 98/101398/2 accepted/tizen/3.0/common/20161203.012246 accepted/tizen/3.0/ivi/20161202.010242 accepted/tizen/3.0/mobile/20161202.010147 accepted/tizen/3.0/wearable/20161202.010221 submit/tizen_3.0/20161201.080450
authorJongkyu Koo <jk.koo@samsung.com>
Thu, 1 Dec 2016 05:44:46 +0000 (14:44 +0900)
committerJongkyu Koo <jk.koo@samsung.com>
Thu, 1 Dec 2016 05:55:03 +0000 (14:55 +0900)
Change-Id: Ic798ace8b3527a75e7cfc7988426461525a74bcd
Signed-off-by: Jongkyu Koo <jk.koo@samsung.com>
server/ctsvc_server_person.c

index 5597d18..dc915e2 100644 (file)
@@ -837,23 +837,23 @@ int ctsvc_person_aggregate(int person_id)
 
                addr_len = snprintf(addr, sizeof(addr), "%d%s", addressbook_id, ADDRESSBOOK_ID_DELIM);
                if (NULL == addressbook_ids) {
-                       addressbook_ids = calloc(addressbooks_len+1, sizeof(char));
+                       addressbook_ids = calloc(addressbooks_len + 1, sizeof(char));
                        if (NULL == addressbook_ids)
                                ERR("alloc() failed");
                }
-               else if (addressbooks_len <= strlen(addressbook_ids)+addr_len) {
-                       int new_addressbooks_len = MAX(addressbooks_len*2, strlen(addressbook_ids)+addr_len+1);
+               else if (addressbooks_len <= strlen(addressbook_ids) + addr_len) {
+                       int new_addressbooks_len = MAX(addressbooks_len * 2, strlen(addressbook_ids) + addr_len + 1);
                        char *new_addressbook_ids = realloc(addressbook_ids, new_addressbooks_len);
                        if (new_addressbook_ids) {
                                addressbook_ids = new_addressbook_ids;
-                               addressbooks_len = new_addressbooks_len
+                               addressbooks_len = new_addressbooks_len;
                        } else {
                                ERR("realloc() failed");
                        }
                }
 
-               if (addressbook_ids && addressbooks_len -len > addr_len)
-                       len += snprintf(addressbook_ids + len, addressbooks_len -len, "%d%s", addressbook_id, ADDRESSBOOK_ID_DELIM);
+               if (addressbook_ids && addressbooks_len - len > addr_len)
+                       len += snprintf(addressbook_ids + len, addressbooks_len - len, "%d%s", addressbook_id, ADDRESSBOOK_ID_DELIM);
 
                if (NULL == image_thumbnail_path && contact_image_thumbnail_path && *contact_image_thumbnail_path) {
                        image_thumbnail_path = SAFE_STRDUP(contact_image_thumbnail_path);