changed cal_calendar_s to cal_book_s

Change-Id: I8397e8f7c933cc82898a4a49fe996da07293d4ad

diff --git a/common/cal_record_calendar.c b/common/cal_record_calendar.c
index cc492d2..bd05b80 100644 (file)
--- a/common/cal_record_calendar.c
+++ b/common/cal_record_calendar.c
@@ -58,9 +58,9 @@ cal_record_plugin_cb_s cal_record_calendar_plugin_cb = {
        .clone_child_record_list = NULL
 };
 
-static void _cal_record_calendar_struct_init(cal_calendar_s *record)
+static void _cal_record_calendar_struct_init(cal_book_s *record)
 {
-       memset(record,0, sizeof(cal_calendar_s));
+       memset(record,0, sizeof(cal_book_s));
        record->index = -1;
        record->visibility = true;
        record->account_id = LOCAL_ACCOUNT_ID;
@@ -69,10 +69,10 @@ static void _cal_record_calendar_struct_init(cal_calendar_s *record)
 
 static int _cal_record_calendar_create(calendar_record_h* out_record)
 {
-       cal_calendar_s *temp = NULL;
+       cal_book_s *temp = NULL;
        int ret= CALENDAR_ERROR_NONE;
 
-       temp = calloc(1, sizeof(cal_calendar_s));
+       temp = calloc(1, sizeof(cal_book_s));
        RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
 
        _cal_record_calendar_struct_init(temp);
@@ -82,7 +82,7 @@ static int _cal_record_calendar_create(calendar_record_h* out_record)
        return ret;
 }
 
-static void _cal_record_calendar_struct_free(cal_calendar_s *record)
+static void _cal_record_calendar_struct_free(cal_book_s *record)
 {
        CAL_FREE(record->uid);
        CAL_FREE(record->name);
@@ -100,7 +100,7 @@ static int _cal_record_calendar_destroy(calendar_record_h record, bool delete_ch
 {
        int ret = CALENDAR_ERROR_NONE;
 
-       cal_calendar_s *temp = (cal_calendar_s*)(record);
+       cal_book_s *temp = (cal_book_s*)(record);
 
        _cal_record_calendar_struct_free(temp);
 
@@ -109,12 +109,12 @@ static int _cal_record_calendar_destroy(calendar_record_h record, bool delete_ch
 
 static int _cal_record_calendar_clone(calendar_record_h record, calendar_record_h* out_record)
 {
-       cal_calendar_s *out_data = NULL;
-       cal_calendar_s *src_data = NULL;
+       cal_book_s *out_data = NULL;
+       cal_book_s *src_data = NULL;
 
-       src_data = (cal_calendar_s*)(record);
+       src_data = (cal_book_s*)(record);
 
-       out_data = calloc(1, sizeof(cal_calendar_s));
+       out_data = calloc(1, sizeof(cal_book_s));
        RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
 
 
@@ -145,7 +145,7 @@ static int _cal_record_calendar_clone(calendar_record_h record, calendar_record_
 
 static int _cal_record_calendar_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
 {
-       cal_calendar_s *cal_rec = (cal_calendar_s*)(record);
+       cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
        case CAL_PROPERTY_CALENDAR_UID:
                *out_str = cal_strdup(cal_rec->uid);
@@ -184,7 +184,7 @@ static int _cal_record_calendar_get_str(calendar_record_h record, unsigned int p
 
 static int _cal_record_calendar_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
 {
-       cal_calendar_s *cal_rec = (cal_calendar_s*)(record);
+       cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
        case CAL_PROPERTY_CALENDAR_UID:
                *out_str = (cal_rec->uid);
@@ -223,7 +223,7 @@ static int _cal_record_calendar_get_str_p(calendar_record_h record, unsigned int
 
 static int _cal_record_calendar_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
 {
-       cal_calendar_s *cal_rec = (cal_calendar_s*)(record);
+       cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
        case CAL_PROPERTY_CALENDAR_ID:
                *out_value = (cal_rec->index);
@@ -253,7 +253,7 @@ static int _cal_record_calendar_get_int(calendar_record_h record, unsigned int p
 
 static int _cal_record_calendar_set_str(calendar_record_h record, unsigned int property_id, const char* value)
 {
-       cal_calendar_s *cal_rec = (cal_calendar_s*)(record);
+       cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
        case CAL_PROPERTY_CALENDAR_UID:
                CAL_FREE(cal_rec->uid);
@@ -301,7 +301,7 @@ static int _cal_record_calendar_set_str(calendar_record_h record, unsigned int p
 
 static int _cal_record_calendar_set_int(calendar_record_h record, unsigned int property_id, int value)
 {
-       cal_calendar_s *cal_rec = (cal_calendar_s*)(record);
+       cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
        case CAL_PROPERTY_CALENDAR_ID:
                (cal_rec->index) = value;

diff --git a/common/cal_typedef.h b/common/cal_typedef.h
index 23bb28a..2df596f 100644 (file)
--- a/common/cal_typedef.h
+++ b/common/cal_typedef.h
@@ -297,7 +297,7 @@ typedef struct
        char *sync_data3;
        char *sync_data4;
        int mode;
-} cal_calendar_s;
+} cal_book_s;
 
 
 /* type for timezone information save */

diff --git a/common/ipc/cal_ipc_marshal_calendar.c b/common/ipc/cal_ipc_marshal_calendar.c
index 337a2ee..a1393f5 100644 (file)
--- a/common/ipc/cal_ipc_marshal_calendar.c
+++ b/common/ipc/cal_ipc_marshal_calendar.c
@@ -32,11 +32,11 @@ cal_ipc_marshal_record_plugin_cb_s cal_ipc_record_calendar_plugin_cb = {
 static int _cal_ipc_unmarshal_calendar(pims_ipc_data_h ipc_data, calendar_record_h record)
 {
        int ret = 0;
-       cal_calendar_s* pcalendar = NULL;
+       cal_book_s* pcalendar = NULL;
        RETV_IF(NULL == ipc_data, CALENDAR_ERROR_NO_DATA);
        RETV_IF(NULL == record, CALENDAR_ERROR_NO_DATA);
 
-       pcalendar = (cal_calendar_s*) record;
+       pcalendar = (cal_book_s*) record;
 
        ret = cal_ipc_unmarshal_int(ipc_data, &pcalendar->index);
        if (CALENDAR_ERROR_NONE != ret) {
@@ -125,7 +125,7 @@ static int _cal_ipc_unmarshal_calendar(pims_ipc_data_h ipc_data, calendar_record
 static int _cal_ipc_marshal_calendar(const calendar_record_h record, pims_ipc_data_h ipc_data)
 {
        int ret = 0;
-       cal_calendar_s* pcalendar = (cal_calendar_s*)record;
+       cal_book_s* pcalendar = (cal_book_s*)record;
        RETV_IF(NULL == ipc_data, CALENDAR_ERROR_NO_DATA);
        RETV_IF(NULL == pcalendar, CALENDAR_ERROR_NO_DATA);
 

diff --git a/server/db/cal_db_plugin_calendar.c b/server/db/cal_db_plugin_calendar.c
index 4830736..8a0cf91 100644 (file)
--- a/server/db/cal_db_plugin_calendar.c
+++ b/server/db/cal_db_plugin_calendar.c
@@ -79,7 +79,7 @@ cal_db_plugin_cb_s cal_db_calendar_plugin_cb = {
        .replace_records = _cal_db_calendar_replace_records
 };
 
-static bool _cal_db_calendar_check_value_validation(cal_calendar_s* calendar)
+static bool _cal_db_calendar_check_value_validation(cal_book_s* calendar)
 {
        RETVM_IF(NULL == calendar, CALENDAR_ERROR_INVALID_PARAMETER, "calendar is NULL");
 
@@ -101,7 +101,7 @@ static int _cal_db_calendar_insert_record(calendar_record_h record, int* id)
        char query[CAL_DB_SQL_MAX_LEN];
        int index = 0;
        sqlite3_stmt *stmt;
-       cal_calendar_s* calendar =  (cal_calendar_s*)(record);
+       cal_book_s* calendar =  (cal_book_s*)(record);
        int ret = 0;
        char *client_label = NULL;
 
@@ -224,7 +224,7 @@ static int _cal_db_calendar_update_record(calendar_record_h record)
        //int rc = -1;
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        sqlite3_stmt *stmt = NULL;
-       cal_calendar_s* calendar =  (cal_calendar_s*)(record);
+       cal_book_s* calendar =  (cal_book_s*)(record);
        int ret = 0;
 
        RETV_IF(NULL == calendar, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -362,7 +362,7 @@ static int _cal_db_calendar_replace_record(calendar_record_h record, int id)
 {
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        sqlite3_stmt *stmt = NULL;
-       cal_calendar_s* calendar =  (cal_calendar_s*)(record);
+       cal_book_s* calendar =  (cal_book_s*)(record);
        int ret = 0;
 
        RETV_IF(NULL == calendar, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -863,7 +863,7 @@ static int _cal_db_calendar_get_count_with_query(calendar_query_h query, int *ou
 
 static void _cal_db_calendar_get_stmt(sqlite3_stmt *stmt,calendar_record_h record)
 {
-       cal_calendar_s* calendar =  (cal_calendar_s*)(record);
+       cal_book_s* calendar =  (cal_book_s*)(record);
        int count = 0;
        const unsigned char *temp;
 
@@ -914,7 +914,7 @@ static void _cal_db_calendar_get_stmt(sqlite3_stmt *stmt,calendar_record_h recor
 static void _cal_db_calendar_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int stmt_count, calendar_record_h record)
 {
-       cal_calendar_s* calendar =  (cal_calendar_s*)(record);
+       cal_book_s* calendar =  (cal_book_s*)(record);
        const unsigned char *temp;
 
        switch (property) {
@@ -993,7 +993,7 @@ static int _cal_db_calendar_update_projection(calendar_record_h record)
 {
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        sqlite3_stmt *stmt = NULL;
-       cal_calendar_s* calendar =  (cal_calendar_s*)(record);
+       cal_book_s* calendar =  (cal_book_s*)(record);
        int ret = 0;
        char* set = NULL;
        GSList *bind_text = NULL;