[UTC][calendar-service2][Non-ARC][fix memory leak, remove not-supported
authorJeesun Kim <iamjs.kim@samsung.com>
Mon, 27 Jun 2016 12:51:53 +0000 (21:51 +0900)
committerjeesun kim <iamjs.kim@samsung.com>
Thu, 30 Jun 2016 12:47:59 +0000 (05:47 -0700)
function]

Change-Id: I92e658be95448b08f7bb395c3539d8143278832a

src/utc/calendar-service2/db/utc-calendar-db-book.c
src/utc/calendar-service2/db/utc-calendar-db-event.c
src/utc/calendar-service2/db/utc-calendar-db-timezone.c
src/utc/calendar-service2/db/utc-calendar-db-todo.c
src/utc/calendar-service2/utc-calendar-vcalendar.c

index 37764b2..1cd3d62 100755 (executable)
@@ -1518,6 +1518,7 @@ UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_book(void)
        ret = calendar_record_create(_calendar_book._uri, &book);
        int book_id = 0;
        calendar_db_insert_record(book, &book_id);
+       calendar_record_destroy(book, true);
 
        int db_version = 1;
        ret = calendar_db_clean_after_sync(book_id, db_version);
index bfb1213..d2e2da0 100755 (executable)
@@ -1067,11 +1067,12 @@ UTC_HIDDEN int utc_calendar_db_get_changes_by_version_p_event(void)
        assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
        int ret = 0;
 
-       int book_id = 0;
+       int event_id = 0;
        int last_version = 1;
        calendar_list_h list = NULL;
        int current_version = 0;
-       ret = calendar_db_get_changes_by_version(_calendar_event._uri, book_id, last_version, &list, &current_version);
+       ret = calendar_db_get_changes_by_version(_calendar_event._uri, event_id,
+                       last_version, &list, &current_version);
        assert_eq(ret, CALENDAR_ERROR_NONE);
 
        calendar_list_destroy(list, true);
@@ -1088,21 +1089,24 @@ UTC_HIDDEN int utc_calendar_db_get_changes_by_version_n_event(void)
        assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
        int ret = 0;
 
-       int book_id = 0;
+       int event_id = 0;
        int last_version = 1;
        calendar_list_h list = NULL;
        int current_version = 0;
 
        // case 1
-       ret = calendar_db_get_changes_by_version(NULL, book_id, last_version, &list, &current_version);
+       ret = calendar_db_get_changes_by_version(NULL, event_id,
+                       last_version, &list, &current_version);
        assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
 
        // case 2
-       ret = calendar_db_get_changes_by_version(_calendar_event._uri, book_id, last_version, NULL, &current_version);
+       ret = calendar_db_get_changes_by_version(_calendar_event._uri, event_id,
+                       last_version, NULL, &current_version);
        assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
 
        // case 3
-       ret = calendar_db_get_changes_by_version(_calendar_event._uri, book_id, last_version, &list, NULL);
+       ret = calendar_db_get_changes_by_version(_calendar_event._uri, event_id,
+                       last_version, &list, NULL);
        assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
        return 0;
 }
@@ -1670,21 +1674,6 @@ UTC_HIDDEN int utc_calendar_db_get_changes_exception_by_version_n_event(void)
  */
 UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_event(void)
 {
-       assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
-       int ret = 0;
-
-       // create book
-       calendar_record_h book = NULL;
-       ret = calendar_record_create(_calendar_book._uri, &book);
-       int book_id = 0;
-       calendar_db_insert_record(book, &book_id);
-
-       int db_version = 1;
-       ret = calendar_db_clean_after_sync(book_id, db_version);
-       assert_eq(ret, CALENDAR_ERROR_NONE);
-
-       // delete book
-       calendar_db_delete_record(_calendar_book._uri, book_id);
        return 0;
 }
 
@@ -1695,12 +1684,5 @@ UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_event(void)
  */
 UTC_HIDDEN int utc_calendar_db_clean_after_sync_n_event(void)
 {
-       assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
-       int ret = 0;
-
-       int book_id = -1;
-       int db_version = 1;
-       ret = calendar_db_clean_after_sync(book_id, db_version);
-       assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
        return 0;
 }
index 328ea7d..32ffcee 100755 (executable)
@@ -1414,21 +1414,6 @@ UTC_HIDDEN int utc_calendar_db_get_changes_exception_by_version_n_timezone(void)
  */
 UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_timezone(void)
 {
-       assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
-       int ret = 0;
-
-       // create book
-       calendar_record_h book = NULL;
-       ret = calendar_record_create(_calendar_book._uri, &book);
-       int book_id = 0;
-       calendar_db_insert_record(book, &book_id);
-
-       int db_version = 1;
-       ret = calendar_db_clean_after_sync(book_id, db_version);
-       assert_eq(ret, CALENDAR_ERROR_NONE);
-
-       // delete book
-       calendar_db_delete_record(_calendar_book._uri, book_id);
        return 0;
 }
 
@@ -1439,12 +1424,5 @@ UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_timezone(void)
  */
 UTC_HIDDEN int utc_calendar_db_clean_after_sync_n_timezone(void)
 {
-       assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
-       int ret = 0;
-
-       int book_id = -1;
-       int db_version = 1;
-       ret = calendar_db_clean_after_sync(book_id, db_version);
-       assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
        return 0;
 }
index d51e5b1..dd6f74a 100755 (executable)
@@ -1067,11 +1067,12 @@ UTC_HIDDEN int utc_calendar_db_get_changes_by_version_p_todo(void)
        assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
        int ret = 0;
 
-       int book_id = 0;
+       int todo_id = 0;
        int last_version = 1;
        calendar_list_h list = NULL;
        int current_version = 0;
-       ret = calendar_db_get_changes_by_version(_calendar_todo._uri, book_id, last_version, &list, &current_version);
+       ret = calendar_db_get_changes_by_version(_calendar_todo._uri, todo_id,
+                       last_version, &list, &current_version);
        assert_eq(ret, CALENDAR_ERROR_NONE);
 
        calendar_list_destroy(list, true);
@@ -1088,21 +1089,24 @@ UTC_HIDDEN int utc_calendar_db_get_changes_by_version_n_todo(void)
        assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
        int ret = 0;
 
-       int book_id = 0;
+       int todo_id = 0;
        int last_version = 1;
        calendar_list_h list = NULL;
        int current_version = 0;
 
        // case 1
-       ret = calendar_db_get_changes_by_version(NULL, book_id, last_version, &list, &current_version);
+       ret = calendar_db_get_changes_by_version(NULL, todo_id,
+                       last_version, &list, &current_version);
        assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
 
        // case 2
-       ret = calendar_db_get_changes_by_version(_calendar_todo._uri, book_id, last_version, NULL, &current_version);
+       ret = calendar_db_get_changes_by_version(_calendar_todo._uri, todo_id,
+                       last_version, NULL, &current_version);
        assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
 
        // case 3
-       ret = calendar_db_get_changes_by_version(_calendar_todo._uri, book_id, last_version, &list, NULL);
+       ret = calendar_db_get_changes_by_version(_calendar_todo._uri, todo_id,
+                       last_version, &list, NULL);
        assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
        return 0;
 }
@@ -1648,21 +1652,6 @@ UTC_HIDDEN int utc_calendar_db_get_changes_exception_by_version_n_todo(void)
  */
 UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_todo(void)
 {
-       assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
-       int ret = 0;
-
-       // create book
-       calendar_record_h book = NULL;
-       ret = calendar_record_create(_calendar_book._uri, &book);
-       int book_id = 0;
-       calendar_db_insert_record(book, &book_id);
-
-       int db_version = 1;
-       ret = calendar_db_clean_after_sync(book_id, db_version);
-       assert_eq(ret, CALENDAR_ERROR_NONE);
-
-       // delete book
-       calendar_db_delete_record(_calendar_book._uri, book_id);
        return 0;
 }
 
@@ -1673,12 +1662,5 @@ UTC_HIDDEN int utc_calendar_db_clean_after_sync_p_todo(void)
  */
 UTC_HIDDEN int utc_calendar_db_clean_after_sync_n_todo(void)
 {
-       assert_eq(g_startup_err, CALENDAR_ERROR_NONE);
-       int ret = 0;
-
-       int book_id = -1;
-       int db_version = 1;
-       ret = calendar_db_clean_after_sync(book_id, db_version);
-       assert_eq(ret, CALENDAR_ERROR_INVALID_PARAMETER);
        return 0;
 }
index 6795742..9314ad4 100755 (executable)
@@ -564,6 +564,7 @@ static int _parse_ver10_alarm_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 }
@@ -600,6 +601,7 @@ static int _parse_ver10_extention_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 }
@@ -640,6 +642,7 @@ static int _parse_ver20_timezone_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_event_fields(void)
@@ -675,6 +678,7 @@ static int _parse_ver20_event_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_vfreebusy_fields(void)
@@ -717,6 +721,7 @@ static int _parse_ver20_vfreebusy_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_attendee_fields(void)
@@ -756,6 +761,7 @@ static int _parse_ver20_attendee_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_alarm_fields(void)
@@ -807,6 +813,7 @@ static int _parse_ver20_alarm_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_todo_fields(void)
@@ -837,6 +844,7 @@ static int _parse_ver20_todo_fields(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_exception_words(void)
@@ -864,6 +872,7 @@ static int _parse_ver20_exception_words(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver20_lunar(void)
@@ -891,6 +900,7 @@ static int _parse_ver20_lunar(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -950,6 +960,7 @@ static int _parse_ver10_once(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver10_daily(void)
@@ -977,6 +988,7 @@ static int _parse_ver10_daily(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver10_weekly(void)
@@ -1004,6 +1016,7 @@ static int _parse_ver10_weekly(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 }
@@ -1032,6 +1045,7 @@ static int _parse_ver10_monthly_bymonthly(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 }
@@ -1060,6 +1074,7 @@ static int _parse_ver10_monthly_byday(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 }
@@ -1088,6 +1103,7 @@ static int _parse_ver10_yearly_bymonth(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 }
@@ -1116,6 +1132,7 @@ static int _parse_ver10_yearly_byyearday(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver10_yearly_byweekno(void)
@@ -1147,6 +1164,7 @@ static int _parse_ver10_yearly_bymonthly(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 static int _parse_ver10_yearly_byday(void)
@@ -1174,6 +1192,7 @@ static int _parse_ver10_yearly_byday(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 
 
@@ -1202,6 +1221,7 @@ static int _parse_ver20_once(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1232,6 +1252,7 @@ static int _parse_ver20_daily(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1263,6 +1284,7 @@ static int _parse_ver20_weekly(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1295,6 +1317,7 @@ static int _parse_ver20_monthly_bymonthly(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1327,6 +1350,7 @@ static int _parse_ver20_monthly_byday_TU(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1360,6 +1384,7 @@ static int _parse_ver20_monthly_byday_1FR(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1392,6 +1417,7 @@ static int _parse_ver20_monthly_byday_bysetpos(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1426,6 +1452,7 @@ static int _parse_ver20_yearly_bymonth(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1461,6 +1488,7 @@ static int _parse_ver20_yearly_byyearday(void)
        ret = calendar_db_delete_records(_calendar_event._uri, ids, count);
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
+       free(ids);
        assert_eq(ret, CALENDAR_ERROR_NONE);
        return ret;
 }
@@ -1494,6 +1522,7 @@ static int _parse_ver20_yearly_byweekno(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1526,6 +1555,7 @@ static int _parse_ver20_yearly_bymonthly(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }
 /*
@@ -1558,6 +1588,7 @@ static int _parse_ver20_yearly_byday(void)
        assert_eq(ret, CALENDAR_ERROR_NONE);
        ret = calendar_list_destroy(list, true);
        assert_eq(ret, CALENDAR_ERROR_NONE);
+       free(ids);
        return ret;
 }