revert memory leak

Change-Id: I0ed430dc1db59fdd84c4a5b4fa58f4cab32a0faa
Signed-off-by: Randeep Singh <randeepsaggu@gmail.com>

diff --git a/common/cal_record_alarm.c b/common/cal_record_alarm.c
index 987b9b7f114f5efbbbf4e17fecbd540680081fbb..154c815825a1bbc17730152281a9c5abda0408c4 100644 (file)
--- a/common/cal_record_alarm.c
+++ b/common/cal_record_alarm.c
@@ -63,7 +63,7 @@ cal_record_plugin_cb_s cal_record_alarm_plugin_cb = {
 static void _cal_record_alarm_struct_init(cal_alarm_s *record)
 {
        memset(record, 0, sizeof(cal_alarm_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_ALARM, &cal_record_alarm_plugin_cb, _calendar_alarm._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_ALARM, &cal_record_alarm_plugin_cb, _calendar_alarm._uri);
 }
 
 static int _cal_record_alarm_create(calendar_record_h* out_record)
@@ -83,7 +83,7 @@ static int _cal_record_alarm_create(calendar_record_h* out_record)
 
 static void _cal_record_alarm_struct_free(cal_alarm_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->alarm_description);
        CAL_FREE(record->alarm_summary);
        CAL_FREE(record->alarm_attach);

diff --git a/common/cal_record_attendee.c b/common/cal_record_attendee.c
index d01265d9d5a950e71d263201fd98ff75614102d1..819511671cd06000f3b6b8020d69d07b985d0729 100644 (file)
--- a/common/cal_record_attendee.c
+++ b/common/cal_record_attendee.c
@@ -61,7 +61,7 @@ cal_record_plugin_cb_s cal_record_attendee_plugin_cb = {
 static void _cal_record_attendee_struct_init(cal_attendee_s *record)
 {
        memset(record, 0, sizeof(cal_attendee_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_ATTENDEE, &cal_record_attendee_plugin_cb, _calendar_attendee._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_ATTENDEE, &cal_record_attendee_plugin_cb, _calendar_attendee._uri);
 }
 
 static int _cal_record_attendee_create(calendar_record_h* out_record)
@@ -81,7 +81,7 @@ static int _cal_record_attendee_create(calendar_record_h* out_record)
 
 static void _cal_record_attendee_struct_free(cal_attendee_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->attendee_number);
        CAL_FREE(record->attendee_uid);
        CAL_FREE(record->attendee_group);

diff --git a/common/cal_record_book.c b/common/cal_record_book.c
index 53fa7fb2071f16eb2cdd7c505340e1e0757b239c..998f0879a8ba820db03ab8dbbe7215b41de8651b 100644 (file)
--- a/common/cal_record_book.c
+++ b/common/cal_record_book.c
@@ -61,7 +61,7 @@ cal_record_plugin_cb_s cal_record_book_plugin_cb = {
 static void _cal_record_book_struct_init(cal_book_s *record)
 {
        memset(record, 0, sizeof(cal_book_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_BOOK, &cal_record_book_plugin_cb, _calendar_book._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_BOOK, &cal_record_book_plugin_cb, _calendar_book._uri);
        record->index = -1;
        record->visibility = true;
        record->account_id = LOCAL_ACCOUNT_ID;
@@ -85,7 +85,7 @@ static int _cal_record_book_create(calendar_record_h* out_record)
 
 static void _cal_record_book_struct_free(cal_book_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->uid);
        CAL_FREE(record->name);
        CAL_FREE(record->description);

diff --git a/common/cal_record_event.c b/common/cal_record_event.c
index 2cfa7d993fbda78eee2d5dbfaebafa43186b2712..fed064f486bb8da4deb014d159c8481a888e6601 100644 (file)
--- a/common/cal_record_event.c
+++ b/common/cal_record_event.c
@@ -75,7 +75,7 @@ cal_record_plugin_cb_s cal_record_event_plugin_cb = {
 static void _cal_record_event_struct_init(cal_event_s *record)
 {
        memset(record, 0, sizeof(cal_event_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_EVENT, &cal_record_event_plugin_cb, _calendar_event._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_EVENT, &cal_record_event_plugin_cb, _calendar_event._uri);
 
        record->meeting_status = CALENDAR_MEETING_STATUS_NOTMEETING;
        record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
@@ -127,7 +127,7 @@ static int _cal_record_event_create(calendar_record_h* out_record)
 
 static void _cal_record_event_struct_free(cal_event_s *record, bool delete_child)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->summary);
        CAL_FREE(record->description);
        CAL_FREE(record->location);

diff --git a/common/cal_record_extended.c b/common/cal_record_extended.c
index 1563bdd41ac831740bbcde776ed8b8897452e772..53306c6a175b84774f7690d4f2521b64089618c9 100644 (file)
--- a/common/cal_record_extended.c
+++ b/common/cal_record_extended.c
@@ -61,7 +61,7 @@ cal_record_plugin_cb_s cal_record_extended_plugin_cb = {
 static void _cal_record_extended_struct_init(cal_extended_s *record)
 {
        memset(record, 0, sizeof(cal_extended_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_EXTENDED, &cal_record_extended_plugin_cb, _calendar_extended_property._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_EXTENDED, &cal_record_extended_plugin_cb, _calendar_extended_property._uri);
 }
 
 static int _cal_record_extended_create(calendar_record_h* out_record)
@@ -81,7 +81,7 @@ static int _cal_record_extended_create(calendar_record_h* out_record)
 
 static void _cal_record_extended_struct_free(cal_extended_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->key);
        CAL_FREE(record->value);
        CAL_FREE(record);

diff --git a/common/cal_record_instance_localtime.c b/common/cal_record_instance_localtime.c
index f37be597eeaf329625c3895d09b6de7c5dab6872..b8cb7549289a5a9da0b3d453a5dcaf2efc788d58 100644 (file)
--- a/common/cal_record_instance_localtime.c
+++ b/common/cal_record_instance_localtime.c
@@ -66,7 +66,7 @@ cal_record_plugin_cb_s cal_record_instance_localtime_plugin_cb = {
 static void _cal_record_instance_localtime_struct_init(cal_instance_localtime_s* record)
 {
        memset(record, 0, sizeof(cal_instance_localtime_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_LOCALTIME, &cal_record_instance_localtime_plugin_cb, _calendar_instance_localtime._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_LOCALTIME, &cal_record_instance_localtime_plugin_cb, _calendar_instance_localtime._uri);
 
        record->event_status = CALENDAR_EVENT_STATUS_NONE;
        record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
@@ -100,7 +100,7 @@ static int _cal_record_instance_localtime_create(calendar_record_h* out_record)
 
 static void _cal_record_instance_localtime_struct_free(cal_instance_localtime_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->summary);
        CAL_FREE(record->description);
        CAL_FREE(record->location);

diff --git a/common/cal_record_instance_localtime_extended.c b/common/cal_record_instance_localtime_extended.c
index 61e2e06e11ef0222421206f3a7295d9a3e09cdf6..217a7624dcb6d11e5bd816d3c68a6f9f0a6bd6a8 100644 (file)
--- a/common/cal_record_instance_localtime_extended.c
+++ b/common/cal_record_instance_localtime_extended.c
@@ -66,7 +66,7 @@ cal_record_plugin_cb_s cal_record_instance_localtime_extended_plugin_cb = {
 static void _cal_record_instance_localtime_extended_struct_init(cal_instance_localtime_extended_s* record)
 {
        memset(record, 0, sizeof(cal_instance_localtime_extended_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED, &cal_record_instance_localtime_extended_plugin_cb, _calendar_instance_localtime_extended._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED, &cal_record_instance_localtime_extended_plugin_cb, _calendar_instance_localtime_extended._uri);
 
        record->event_status = CALENDAR_EVENT_STATUS_NONE;
        record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
@@ -100,7 +100,7 @@ static int _cal_record_instance_localtime_extended_create(calendar_record_h* out
 
 static void _cal_record_instance_localtime_extended_struct_free(cal_instance_localtime_extended_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->summary);
        CAL_FREE(record->description);
        CAL_FREE(record->location);

diff --git a/common/cal_record_instance_utime.c b/common/cal_record_instance_utime.c
index f93758ec9cd91c6caff088f211184051f2928de0..5ccea56718396d118f95377df378402163861f47 100644 (file)
--- a/common/cal_record_instance_utime.c
+++ b/common/cal_record_instance_utime.c
@@ -66,7 +66,7 @@ cal_record_plugin_cb_s cal_record_instance_utime_plugin_cb = {
 static void _cal_record_instance_utime_struct_init(cal_instance_utime_s* record)
 {
        memset(record, 0, sizeof(cal_instance_utime_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_UTIME, &cal_record_instance_utime_plugin_cb, _calendar_instance_utime._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_UTIME, &cal_record_instance_utime_plugin_cb, _calendar_instance_utime._uri);
 
        record->event_status = CALENDAR_EVENT_STATUS_NONE;
        record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
@@ -100,7 +100,7 @@ static int _cal_record_instance_utime_create(calendar_record_h* out_record)
 
 static void _cal_record_instance_utime_struct_free(cal_instance_utime_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->summary);
        CAL_FREE(record->description);
        CAL_FREE(record->location);

diff --git a/common/cal_record_instance_utime_extended.c b/common/cal_record_instance_utime_extended.c
index fb288af4f47472f146f645ef259c2503a7ba1044..a725bfd37cf10704038268f681a05dd0e2b18e27 100644 (file)
--- a/common/cal_record_instance_utime_extended.c
+++ b/common/cal_record_instance_utime_extended.c
@@ -66,7 +66,7 @@ cal_record_plugin_cb_s cal_record_instance_utime_extended_plugin_cb = {
 static void _cal_record_instance_utime_extended_struct_init(cal_instance_utime_extended_s* record)
 {
        memset(record, 0, sizeof(cal_instance_utime_extended_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED, &cal_record_instance_utime_extended_plugin_cb, _calendar_instance_utime_extended._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED, &cal_record_instance_utime_extended_plugin_cb, _calendar_instance_utime_extended._uri);
 
        record->event_status = CALENDAR_EVENT_STATUS_NONE;
        record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
@@ -100,7 +100,7 @@ static int _cal_record_instance_utime_extended_create(calendar_record_h* out_rec
 
 static void _cal_record_instance_utime_extended_struct_free(cal_instance_utime_extended_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->summary);
        CAL_FREE(record->description);
        CAL_FREE(record->location);

diff --git a/common/cal_record_search.c b/common/cal_record_search.c
index f547bb4fd6f3d2b431161bda96d2b797ffe9778f..912d48c828d66d57c943695531cb30b3601b84bd 100644 (file)
--- a/common/cal_record_search.c
+++ b/common/cal_record_search.c
@@ -71,7 +71,7 @@ static int _cal_record_search_create(calendar_record_h* out_record)
 
        temp = calloc(1, sizeof(cal_search_s));
        RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-       CAL_RECORD_INIT_COMMON(&temp->common, CAL_RECORD_TYPE_SEARCH, &cal_record_search_plugin_cb, _calendar_search._uri);
+       //CAL_RECORD_INIT_COMMON(&temp->common, CAL_RECORD_TYPE_SEARCH, &cal_record_search_plugin_cb, _calendar_search._uri);
 
        *out_record = (calendar_record_h)temp;
 
@@ -85,7 +85,7 @@ static int _cal_record_search_destroy(calendar_record_h record, bool delete_chil
 
        cal_search_s *temp = (cal_search_s*)(record);
 
-       CAL_RECORD_RESET_COMMON(&temp->common);
+       //CAL_RECORD_RESET_COMMON(&temp->common);
 
        for (cursor = temp->values; cursor; cursor = cursor->next) {
                cal_search_value_s *data = cursor->data;
@@ -118,7 +118,8 @@ static int _cal_record_search_clone(calendar_record_h record, calendar_record_h*
                cal_search_value_s *src = cursor->data;
                cal_search_value_s *dest = calloc(1, sizeof(cal_search_value_s));
                if (NULL == dest) {
-                       _cal_record_search_destroy((calendar_record_h)out_data, true);
+                       CAL_FREE(out_data);
+                       //_cal_record_search_destroy((calendar_record_h)out_data, true);
                        return CALENDAR_ERROR_OUT_OF_MEMORY;
                }
                dest->property_id = src->property_id;

diff --git a/common/cal_record_timezone.c b/common/cal_record_timezone.c
index 3e6050b9de183e1314bd9a82924fb4b7cec7df11..6f72ef37acb86b2836d9750e69982934ebd1d026 100644 (file)
--- a/common/cal_record_timezone.c
+++ b/common/cal_record_timezone.c
@@ -61,7 +61,7 @@ cal_record_plugin_cb_s cal_record_timezone_plugin_cb = {
 static void _cal_record_timezone_struct_init(cal_timezone_s *record)
 {
        memset(record, 0, sizeof(cal_timezone_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_TIMEZONE, &cal_record_timezone_plugin_cb, _calendar_timezone._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_TIMEZONE, &cal_record_timezone_plugin_cb, _calendar_timezone._uri);
        record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
 }
 
@@ -82,7 +82,7 @@ static int _cal_record_timezone_create(calendar_record_h* out_record)
 
 static void _cal_record_timezone_struct_free(cal_timezone_s *record)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->standard_name);
        CAL_FREE(record->day_light_name);
        CAL_FREE(record);

diff --git a/common/cal_record_todo.c b/common/cal_record_todo.c
index 3de28aac28bb07981b123c278ea1da43ec386f18..badc92d7da2d0c46ee3a6308198d6a57477dcdfc 100644 (file)
--- a/common/cal_record_todo.c
+++ b/common/cal_record_todo.c
@@ -74,7 +74,7 @@ cal_record_plugin_cb_s cal_record_todo_plugin_cb = {
 static void _cal_record_todo_struct_init(cal_todo_s *record)
 {
        memset(record, 0, sizeof(cal_todo_s));
-       CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_TODO, &cal_record_todo_plugin_cb, _calendar_todo._uri);
+       //CAL_RECORD_INIT_COMMON(&record->common, CAL_RECORD_TYPE_TODO, &cal_record_todo_plugin_cb, _calendar_todo._uri);
 
        record->todo_status = CALENDAR_TODO_STATUS_NONE;
        record->calendar_id = DEFAULT_TODO_CALENDAR_BOOK_ID;
@@ -118,7 +118,7 @@ static int _cal_record_todo_create(calendar_record_h* out_record)
 
 static void _cal_record_todo_struct_free(cal_todo_s *record, bool delete_child)
 {
-       CAL_RECORD_RESET_COMMON(&record->common);
+       //CAL_RECORD_RESET_COMMON(&record->common);
        CAL_FREE(record->summary);
        CAL_FREE(record->description);
        CAL_FREE(record->location);

diff --git a/common/cal_vcalendar_make.c b/common/cal_vcalendar_make.c
index 68da765f62d82242f293ae7494c17badcba0f18b..857e89684e3c965243895f5eae2d373ee8eff9c8 100644 (file)
--- a/common/cal_vcalendar_make.c
+++ b/common/cal_vcalendar_make.c
@@ -183,12 +183,13 @@ void cal_vcalendar_make_free(cal_make_s **b)
        if (!b || !*b)
                return;
 
-       CAL_FREE((*b)->timezone_tzid);
+       //CAL_FREE((*b)->timezone_tzid);
        if ((*b)->data)
                free((*b)->data);
 
        free(*b);
-       *b = NULL;
+       b = NULL;
+       //*b = NULL;
 }
 
 static int  _cal_vcalendar_make_time(cal_make_s *b, char *tzid, calendar_time_s *t, const char *prop)