From 666b7bee0acb9ddd5e8d55f0a85b330775f3997d Mon Sep 17 00:00:00 2001 From: Myungki Lee Date: Wed, 16 Mar 2016 10:41:24 +0900 Subject: [PATCH] Use thread-safe function Change-Id: I05268be167ed04d3201a4180f6101961d969d6b6 Signed-off-by: Myungki Lee --- alarm-manager-schedule.c | 8 ++++---- alarm-manager.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alarm-manager-schedule.c b/alarm-manager-schedule.c index e587188..696655a 100644 --- a/alarm-manager-schedule.c +++ b/alarm-manager-schedule.c @@ -437,14 +437,14 @@ time_t _alarm_next_duetime(__alarm_info_t *__alarm_info) int is_dst = 0; time_t current_time = 0; time_t due_time = 0; - struct tm *cur_tm = NULL ; - struct tm *due_tm = NULL ; + struct tm tm, *cur_tm = NULL; + struct tm *due_tm = NULL; alarm_info_t *alarm_info = &__alarm_info->alarm_info; alarm_mode_t *mode = &alarm_info->mode; time(¤t_time); - cur_tm = localtime(¤t_time); + cur_tm = localtime_r(¤t_time, &tm); if (cur_tm && cur_tm->tm_isdst > 0) is_dst = 1; @@ -467,7 +467,7 @@ time_t _alarm_next_duetime(__alarm_info_t *__alarm_info) } if (mode->repeat != ALARM_REPEAT_MODE_WEEKLY && mode->repeat != ALARM_REPEAT_MODE_ONCE) { - due_tm = localtime(&due_time); + due_tm = localtime_r(&due_time, &tm); if (is_dst == 0 && due_tm && due_tm->tm_isdst == 1) { ALARM_MGR_LOG_PRINT("DST alarm found, enable\n"); due_tm->tm_hour = due_tm->tm_hour - DST_TIME_DIFF; diff --git a/alarm-manager.c b/alarm-manager.c index 72b7b38..55da983 100644 --- a/alarm-manager.c +++ b/alarm-manager.c @@ -1946,7 +1946,7 @@ gboolean alarm_manager_alarm_set_rtc_time(AlarmManager *pObj, GDBusMethodInvocat struct rtc_wkalrm rtc_wkalarm; int retval = 0; int return_code = ALARMMGR_RESULT_SUCCESS; - struct tm *alarm_tm = NULL; + struct tm tm, *alarm_tm = NULL; #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; @@ -1955,7 +1955,7 @@ gboolean alarm_manager_alarm_set_rtc_time(AlarmManager *pObj, GDBusMethodInvocat time_t current_time; current_time = time(NULL); - alarm_tm = localtime(¤t_time); + alarm_tm = localtime_r(¤t_time, &tm); if (alarm_tm == NULL) { ALARM_MGR_EXCEPTION_PRINT("alarm_tm is NULL"); return true; -- 2.7.4