function error is checked as dbus error

Change-Id: I9d114d1a77796bb9bcbfce238b934743a0778572

diff --git a/client/cal_client_db.c b/client/cal_client_db.c
index a209b65..1d429b1 100644 (file)
--- a/client/cal_client_db.c
+++ b/client/cal_client_db.c
@@ -24,22 +24,16 @@
 #include "cal_client_db_helper.h"
 
 #define CAL_DBUS_RETRY_MAX 1
-#define CAL_DBUS_RETRY_CALL(func) \
-       int _d_ret = -1; \
-       int _d_count = 0; \
-       while (CALENDAR_ERROR_NONE != _d_ret) { \
-               _d_ret = func; \
-               if (CALENDAR_ERROR_NONE == _d_ret) \
+#define CAL_DBUS_RETRY_CALL(ret, func) \
+       int retry_count = 0; \
+       while (retry_count <= CAL_DBUS_RETRY_MAX) { \
+               ret = func; \
+               if (CALENDAR_ERROR_IPC != ret) \
                        break; \
-               _d_count++; \
-               if (CAL_DBUS_RETRY_MAX < _d_count) { \
-                       ERR("retry call: reach max(%d)", _d_count); \
-                       break; \
-               } \
-               ERR("retry call:count(%d)", _d_count); \
+               ERR("retry call"); \
                cal_dbus_recovery(); \
-       } \
-       ret = _d_ret;
+               retry_count++; \
+       }
 
 EXPORT_API int calendar_db_insert_record(calendar_record_h record, int* id)
 {
@@ -52,7 +46,7 @@ EXPORT_API int calendar_db_insert_record(calendar_record_h record, int* id)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_insert_record(handle, record, id));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_insert_record(handle, record, id));
        return ret;
 }
 
@@ -66,7 +60,7 @@ EXPORT_API int calendar_db_update_record(calendar_record_h record)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_update_record(handle, record));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_update_record(handle, record));
        return ret;
 }
 
@@ -81,7 +75,7 @@ EXPORT_API int calendar_db_delete_record(const char* view_uri, int id)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_delete_record(handle, view_uri, id));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_delete_record(handle, view_uri, id));
        return ret;
 }
 
@@ -95,7 +89,7 @@ EXPORT_API int calendar_db_replace_record(calendar_record_h record, int record_i
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_replace_record(handle, record, record_id));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_replace_record(handle, record, record_id));
        return ret;
 }
 
@@ -110,7 +104,7 @@ EXPORT_API int calendar_db_get_record(const char* view_uri, int id, calendar_rec
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_record(handle, view_uri, id, out_record));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_record(handle, view_uri, id, out_record));
        return ret;
 }
 
@@ -125,7 +119,7 @@ EXPORT_API int calendar_db_get_all_records(const char* view_uri, int offset, int
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_all_records(handle, view_uri, offset, limit, out_list));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_all_records(handle, view_uri, offset, limit, out_list));
        return ret;
 }
 
@@ -140,7 +134,7 @@ EXPORT_API int calendar_db_get_records_with_query(calendar_query_h query, int of
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_records_with_query(handle, query, offset, limit, out_list));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_records_with_query(handle, query, offset, limit, out_list));
        return ret;
 }
 
@@ -153,7 +147,7 @@ EXPORT_API int calendar_db_clean_after_sync(int book_id, int calendar_db_version
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_clean_after_sync(handle, book_id, calendar_db_version));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_clean_after_sync(handle, book_id, calendar_db_version));
        return ret;
 }
 
@@ -167,7 +161,7 @@ EXPORT_API int calendar_db_get_count(const char *view_uri, int *out_count)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_count(handle, view_uri, out_count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_count(handle, view_uri, out_count));
        return ret;
 }
 
@@ -182,7 +176,7 @@ EXPORT_API int calendar_db_get_count_with_query(calendar_query_h query, int *out
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_count_with_query(handle, query, out_count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_count_with_query(handle, query, out_count));
        return ret;
 }
 
@@ -205,7 +199,7 @@ EXPORT_API int calendar_db_insert_records(calendar_list_h record_list, int** rec
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_insert_records(handle, record_list, record_id_array, count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_insert_records(handle, record_list, record_id_array, count));
        return ret;
 }
 
@@ -226,7 +220,7 @@ EXPORT_API int calendar_db_update_records(calendar_list_h record_list)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_update_records(handle, record_list));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_update_records(handle, record_list));
        return ret;
 }
 
@@ -240,7 +234,7 @@ EXPORT_API int calendar_db_delete_records(const char* view_uri, int record_id_ar
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_delete_records(handle, view_uri, record_id_array, count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_delete_records(handle, view_uri, record_id_array, count));
        return ret;
 }
 
@@ -263,7 +257,7 @@ EXPORT_API int calendar_db_replace_records(calendar_list_h record_list, int *rec
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_replace_records(handle, record_list, record_id_array, count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_replace_records(handle, record_list, record_id_array, count));
        return ret;
 }
 
@@ -280,7 +274,7 @@ EXPORT_API int calendar_db_get_changes_by_version(const char* view_uri, int book
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_changes_by_version(handle, view_uri, book_id,
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_changes_by_version(handle, view_uri, book_id,
                        calendar_db_version, record_list, current_version));
        return ret;
 }
@@ -295,7 +289,7 @@ EXPORT_API int calendar_db_get_current_version(int* current_version)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_current_version(handle, current_version));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_current_version(handle, current_version));
        return ret;
 }
 
@@ -309,7 +303,7 @@ EXPORT_API int calendar_db_add_changed_cb(const char* view_uri, calendar_db_chan
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_add_changed_cb(handle, view_uri, callback, user_data));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_add_changed_cb(handle, view_uri, callback, user_data));
        return ret;
 }
 
@@ -323,7 +317,7 @@ EXPORT_API int calendar_db_remove_changed_cb(const char* view_uri, calendar_db_c
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_remove_changed_cb(handle, view_uri, callback, user_data));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_remove_changed_cb(handle, view_uri, callback, user_data));
        return ret;
 }
 
@@ -339,7 +333,7 @@ EXPORT_API int calendar_db_insert_vcalendars(const char* vcalendar_stream, int *
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_insert_vcalendars(handle, vcalendar_stream, record_id_array, count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_insert_vcalendars(handle, vcalendar_stream, record_id_array, count));
        return ret;
 }
 
@@ -354,7 +348,7 @@ EXPORT_API int calendar_db_replace_vcalendars(const char* vcalendar_stream, int
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_replace_vcalendars(handle, vcalendar_stream, record_id_array, count));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_replace_vcalendars(handle, vcalendar_stream, record_id_array, count));
        return ret;
 }
 
@@ -368,7 +362,7 @@ EXPORT_API int calendar_db_get_last_change_version(int* last_version)
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_last_change_version(handle, last_version));
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_last_change_version(handle, last_version));
        return ret;
 }
 
@@ -386,7 +380,7 @@ EXPORT_API int calendar_db_get_changes_exception_by_version(const char* view_uri
 
        ret = cal_client_handle_get_p(&handle);
        RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_client_handle_get_p() Fail(%d)", ret);
-       CAL_DBUS_RETRY_CALL(cal_dbus_get_changes_exception_by_version(handle, view_uri,
+       CAL_DBUS_RETRY_CALL(ret, cal_dbus_get_changes_exception_by_version(handle, view_uri,
                                original_event_id, calendar_db_version, record_list));
        return ret;
 }

diff --git a/client/cal_client_dbus.c b/client/cal_client_dbus.c
index d261bda..4944702 100644 (file)
--- a/client/cal_client_dbus.c
+++ b/client/cal_client_dbus.c
@@ -595,15 +595,6 @@ int cal_dbus_get_record(calendar_h handle, const char *view_uri, int id,
                return ret;
                /* LCOV_EXCL_STOP */
        }
-
-       if (CALENDAR_ERROR_NONE != ret) {
-               /* LCOV_EXCL_START */
-               ERR("get_record() Fail(%d)", ret);
-               g_variant_unref(arg_record);
-               *out_record = NULL;
-               return ret;
-               /* LCOV_EXCL_STOP */
-       }
        cal_dbus_utils_gvariant_to_record(arg_record, out_record);
        g_variant_unref(arg_record);
 
@@ -636,16 +627,6 @@ int cal_dbus_get_all_records(calendar_h handle, const char *view_uri,
                return ret;
                /* LCOV_EXCL_STOP */
        }
-
-       if (CALENDAR_ERROR_NONE != ret) {
-               /* LCOV_EXCL_START */
-               ERR("get_all_records() Fail(%d)", ret);
-               g_variant_unref(arg_list);
-               *out_list = NULL;
-               return ret;
-               /* LCOV_EXCL_STOP */
-       }
-
        cal_dbus_utils_gvariant_to_list(arg_list, out_list);
        g_variant_unref(arg_list);
 
@@ -828,12 +809,6 @@ int cal_dbus_get_current_version(calendar_h handle, int *out_version)
                return ret;
                /* LCOV_EXCL_STOP */
        }
-       if (CALENDAR_ERROR_NONE != ret) {
-               /* LCOV_EXCL_START */
-               ERR("server return Fail(%d)", ret);
-               return ret;
-               /* LCOV_EXCL_STOP */
-       }
        *out_version = version;
 
        return ret;