From a8d5d1d32b21a7a618d00740a55e01e232d706af Mon Sep 17 00:00:00 2001 From: Jeesun Kim Date: Thu, 2 May 2013 19:31:03 +0900 Subject: [PATCH] [misc] fixed disconnect problem, extended value field --- client/cal_client_ipc.c | 14 ++++++++------ common/cal_vcalendar_parse.c | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/cal_client_ipc.c b/client/cal_client_ipc.c index 7f16f38..e87ddc9 100644 --- a/client/cal_client_ipc.c +++ b/client/cal_client_ipc.c @@ -144,18 +144,22 @@ API int calendar_disconnect(void) pims_ipc_data_h indata = NULL; pims_ipc_data_h outdata = NULL; - retvm_if(calendar_ipc==NULL,CALENDAR_ERROR_NOT_PERMITTED,"calendar not connected"); - CAL_FN_CALL; _cal_mutex_lock(CAL_MUTEX_CONNECTION); + if (calendar_ipc == NULL) + { + ERR("calendar not connected"); + ret = CALENDAR_ERROR_NOT_PERMITTED; + goto ERROR_RETURN; + } + if (calendar_connection_count > 1) { calendar_connection_count--; CAL_DBG("calendar connect count -1 = %d",calendar_connection_count); ret = CALENDAR_ERROR_NONE; - _cal_mutex_unlock(CAL_MUTEX_CONNECTION); - return ret; + goto ERROR_RETURN; } else { @@ -195,8 +199,6 @@ API int calendar_disconnect(void) _cal_view_finalize(); } - _cal_mutex_unlock(CAL_MUTEX_CONNECTION); - return ret; ERROR_RETURN: _cal_mutex_unlock(CAL_MUTEX_CONNECTION); diff --git a/common/cal_vcalendar_parse.c b/common/cal_vcalendar_parse.c index 6d37ff3..6d138ee 100644 --- a/common/cal_vcalendar_parse.c +++ b/common/cal_vcalendar_parse.c @@ -1939,14 +1939,14 @@ static int __cal_vcalendar_parse_extended(int type, calendar_list_h list, calend return ret; } - DBG("key[%s]value[%s]", prop, cont +1); + DBG("key[%s]value[%s]", prop, cont); ret = calendar_record_set_str(extended, _calendar_extended_property.key, prop); if (CALENDAR_ERROR_NONE != ret) { ERR("calendar_record_set_str() failed"); return ret; } - ret = calendar_record_set_str(extended, _calendar_extended_property.value, cont +1); + ret = calendar_record_set_str(extended, _calendar_extended_property.value, cont); if (CALENDAR_ERROR_NONE != ret) { ERR("calendar_record_set_str() failed"); -- 2.7.4