summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyungki Lee <mk5004.lee@samsung.com>2016-03-16 10:41:24 +0900
committerMyungki Lee <mk5004.lee@samsung.com>2016-03-16 10:41:24 +0900
commit666b7bee0acb9ddd5e8d55f0a85b330775f3997d (patch)
tree90578cd3d90e325e42058b986869773cdf81abc8
parent0e07698e1dd94d7ab87b39fff320e224033cf8a9 (diff)
downloadalarm-manager-666b7bee0acb9ddd5e8d55f0a85b330775f3997d.tar.gz
alarm-manager-666b7bee0acb9ddd5e8d55f0a85b330775f3997d.tar.bz2
alarm-manager-666b7bee0acb9ddd5e8d55f0a85b330775f3997d.zip
Change-Id: I05268be167ed04d3201a4180f6101961d969d6b6 Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>
-rw-r--r--alarm-manager-schedule.c8
-rw-r--r--alarm-manager.c4
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(&current_time);
- cur_tm = localtime(&current_time);
+ cur_tm = localtime_r(&current_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(&current_time);
+ alarm_tm = localtime_r(&current_time, &tm);
if (alarm_tm == NULL) {
ALARM_MGR_EXCEPTION_PRINT("alarm_tm is NULL");
return true;