From 8e7d2ece86c0fd30c3b8c4e2be6d6ae1a0c86981 Mon Sep 17 00:00:00 2001 From: sinikang Date: Thu, 17 Jan 2019 17:49:31 +0900 Subject: [PATCH] Fix again svace issue (WGID 308150) Change-Id: I6aeeaeb4965bfe752b6dc1db5100467e5821d591 Signed-off-by: sinikang --- src/time_update.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/time_update.c b/src/time_update.c index da25289..529b424 100644 --- a/src/time_update.c +++ b/src/time_update.c @@ -223,7 +223,7 @@ static gboolean __update_timezone_by_offset(const struct tnoti_network_timeinfo } else { UChar utf16_timezone[NITZ_TIMEZONE_MAX_LEN] = { 0 }; UCalendar *cal = NULL; - bool in_dst = false; + int in_dst = 0; UErrorCode ec = U_ZERO_ERROR; GList *list = NULL; @@ -239,7 +239,7 @@ static gboolean __update_timezone_by_offset(const struct tnoti_network_timeinfo } in_dst = ucal_inDaylightTime(cal, &ec); dbg("TZ DST:[%d] WANTED DST:[%d][%d]", in_dst, ti->isdst, ti->dstoff); - if (ti->dstoff == (int)in_dst) { + if (ti->dstoff == in_dst) { found = TRUE; info("(%s) was selected", timezone_name); ucal_close(cal); @@ -311,7 +311,7 @@ GList * nitz_get_tzlist(char *iso) const UChar* timezone_id = 0; int timezone_id_len = 0; int offset = 0; - bool in_dst = false; + int in_dst = 0; GList *tz_list = NULL; UCalendar *cal = NULL; unsigned int offset_hash = 0; @@ -329,7 +329,9 @@ GList * nitz_get_tzlist(char *iso) break; cal = ucal_open(timezone_id, u_strlen(timezone_id), uloc_getDefault(), UCAL_TRADITIONAL, &ec); - in_dst = ucal_inDaylightTime(cal, &ec); + if (ucal_inDaylightTime(cal, &ec) == TRUE) + in_dst = 1; + offset = ucal_get(cal, UCAL_ZONE_OFFSET, &ec); offset_hash = (offset/1800000) + 24; ucal_close(cal); -- 2.7.4