update define:calendar_delete->cleanup

Change-Id: I2978f73d9d39df413bd9b9469d66aa7c117587b4

diff --git a/server/cal_server_cleanup.c b/server/cal_server_cleanup.c
index 1cd5ecd..90cbbd8 100644 (file)
--- a/server/cal_server_cleanup.c
+++ b/server/cal_server_cleanup.c
@@ -30,9 +30,9 @@
 #include "cal_server_ondemand.h"
 #include "cal_server_cleanup.h"
 
-#define CAL_SERVER_CALENDAR_DELETE_COUNT 50
-#define CAL_SERVER_CALENDAR_DELETE_STEP_TIME 1
-#define CAL_SERVER_CALENDAR_DELETE_THREAD_NAME "cal_server_cleanup"
+#define CAL_SERVER_CLEANUP_COUNT 50
+#define CAL_SERVER_CLEANUP_SLEEP_TIME 1
+#define CAL_SERVER_CLEANUP_THREAD_NAME "cal_server_cleanup"
 
 GThread *_cal_server_cleanup_thread = NULL;
 GCond _cal_server_cleanup_cond;
@@ -79,7 +79,7 @@ static void cal_server_calendar_clean_book(int in_count)
        char query[CAL_DB_SQL_MIN_LEN] = {0};
 
        while (in_count > 0) {
-               sleep(CAL_SERVER_CALENDAR_DELETE_STEP_TIME); /* sleep 1 sec. */
+               sleep(CAL_SERVER_CLEANUP_SLEEP_TIME); /* sleep 1 sec. */
 
                ret = cal_db_util_begin_trans();
                if (CALENDAR_ERROR_NONE != ret) {
@@ -92,7 +92,7 @@ static void cal_server_calendar_clean_book(int in_count)
                /* SQLITE ENABLE UPDATE DELETE LIMIT is nat activated */
                snprintf(query, sizeof(query), "DELETE FROM "CAL_TABLE_CALENDAR" "
                                "WHERE id in (SELECT id FROM "CAL_TABLE_CALENDAR" WHERE "
-                               "deleted = 1 LIMIT %d)", CAL_SERVER_CALENDAR_DELETE_COUNT);
+                               "deleted = 1 LIMIT %d)", CAL_SERVER_CLEANUP_COUNT);
                ret = cal_db_util_query_exec(query);
                if (CALENDAR_ERROR_NONE != ret) {
                        /* LCOV_EXCL_START */
@@ -103,7 +103,7 @@ static void cal_server_calendar_clean_book(int in_count)
                        /* LCOV_EXCL_STOP */
                }
                cal_db_util_end_trans(true);
-               in_count -= CAL_SERVER_CALENDAR_DELETE_COUNT;
+               in_count -= CAL_SERVER_CLEANUP_COUNT;
        }
 }
 
@@ -164,7 +164,7 @@ void cal_server_cleanup_start(void)
        if (NULL == _cal_server_cleanup_thread) {
                g_mutex_init(&_cal_server_cleanup_mutex);
                g_cond_init(&_cal_server_cleanup_cond);
-               _cal_server_cleanup_thread = g_thread_new(CAL_SERVER_CALENDAR_DELETE_THREAD_NAME,
+               _cal_server_cleanup_thread = g_thread_new(CAL_SERVER_CLEANUP_THREAD_NAME,
                                _cal_server_calendar_main, NULL);
        }
        /* don't use mutex. */

diff --git a/server/cal_server_cleanup.h b/server/cal_server_cleanup.h
index d0cc526..d422b79 100644 (file)
--- a/server/cal_server_cleanup.h
+++ b/server/cal_server_cleanup.h
@@ -16,10 +16,10 @@
  * limitations under the License.
  *
  */
-#ifndef __CAL_SERVER_CALENDAR_DELETE_H__
-#define __CAL_SERVER_CALENDAR_DELETE_H__
+#ifndef __CAL_SERVER_CLEANUP_H__
+#define __CAL_SERVER_CLEANUP_H__
 
 void cal_server_cleanup_start(void);
 void cal_server_cleanup_end(void);
 
-#endif /*__CAL_SERVER_CALENDAR_DELETE_H__*/
+#endif /*__CAL_SERVER_CLEANUP_H__*/