From 0cb9e5b5c79127eedfdd1111b28032aebe28c3c7 Mon Sep 17 00:00:00 2001 From: sinikang Date: Thu, 15 Mar 2018 17:17:39 +0900 Subject: [PATCH] Fix coverity issue (CID 109176) - add the fix for some coding rule errors Change-Id: I781bc3577af9150a1ee591a57d4a58dfd06918da --- packaging/tel-plugin-nitz.spec | 2 +- src/time_update.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec index 44e05e4..bdc469b 100644 --- a/packaging/tel-plugin-nitz.spec +++ b/packaging/tel-plugin-nitz.spec @@ -3,7 +3,7 @@ %define major 0 %define minor 1 -%define patchlevel 78 +%define patchlevel 79 Name: tel-plugin-nitz Summary: nitz plugin for telephony diff --git a/src/time_update.c b/src/time_update.c index d010ec6..9b2d744 100644 --- a/src/time_update.c +++ b/src/time_update.c @@ -60,7 +60,7 @@ gboolean nitz_is_iso_changed(char *iso) char *saved_iso = NULL; gboolean area_changed = TRUE; - saved_iso = vconf_get_str (VCONFKEY_TELEPHONY_NITZ_ISO); + saved_iso = vconf_get_str(VCONFKEY_TELEPHONY_NITZ_ISO); if (saved_iso) { info("saved iso:[%s], mcc iso:[%s]", saved_iso, iso); if (g_ascii_strcasecmp(saved_iso, iso) == 0) { @@ -78,7 +78,7 @@ void nitz_set_iso(char *iso) if (!iso) return; - ret = vconf_set_str (VCONFKEY_TELEPHONY_NITZ_ISO, iso); + ret = vconf_set_str(VCONFKEY_TELEPHONY_NITZ_ISO, iso); if (ret < 0) { warn("Fail to save iso:[%s]. ret=%d", iso, ret); } else { @@ -113,7 +113,7 @@ gboolean nitz_set_time(struct timespec newtime, struct timespec curtime) /* * - Apply system time(GMT) */ - info ("[TIMESTAMP][Before] New Time[secs = %lu, nsecs = %lu], Current Time[secs = %lu, nsecs = %lu]", + info("[TIMESTAMP][Before] New Time[secs = %lu, nsecs = %lu], Current Time[secs = %lu, nsecs = %lu]", newtime.tv_sec, newtime.tv_nsec, curtime.tv_sec, curtime.tv_nsec); /* Acquire lock */ @@ -122,9 +122,9 @@ gboolean nitz_set_time(struct timespec newtime, struct timespec curtime) err("ret : (0x%x)", ret); if (alarmmgr_set_systime_with_propagation_delay(newtime, curtime) != ALARMMGR_RESULT_SUCCESS) { - info ("[TIMESTAMP] alarmmgr_set_systime_with_propagation_delay fail. (ret=%d)", ret); + info("[TIMESTAMP] alarmmgr_set_systime_with_propagation_delay fail. (ret=%d)", ret); } else { - info ("[TIMESTAMP][After] alarmmgr_set_systime_with_propagation_delay success"); + info("[TIMESTAMP][After] alarmmgr_set_systime_with_propagation_delay success"); } /* Release lock */ @@ -150,13 +150,13 @@ gboolean nitz_apply_tzfile(const char *tzfilename) current = vconf_get_str(VCONFKEY_TELEPHONY_NITZ_ZONE); if (current) { if (g_strcmp0(tzfilename, current)) { - ret = vconf_set_str (VCONFKEY_TELEPHONY_NITZ_ZONE, tzfilename); + ret = vconf_set_str(VCONFKEY_TELEPHONY_NITZ_ZONE, tzfilename); } else { dbg("Same timezone - current[%s], tzfilename[%s]", current, tzfilename); } free(current); } else { - ret = vconf_set_str (VCONFKEY_TELEPHONY_NITZ_ZONE, tzfilename); + ret = vconf_set_str(VCONFKEY_TELEPHONY_NITZ_ZONE, tzfilename); } if (!nitz_is_auto_timezone()) { @@ -188,7 +188,7 @@ gboolean nitz_apply_tzfile(const char *tzfilename) ret = alarmmgr_set_timezone(buf); /* Release lock */ - device_power_release_lock(POWER_LOCK_CPU); + ret = device_power_release_lock(POWER_LOCK_CPU); if (ret < 0) err("ret : (0x%x)", ret); @@ -251,7 +251,7 @@ static gboolean __update_timezone_by_offset(const struct tnoti_network_timeinfo } if (found) { - ret = nitz_apply_tzfile (timezone_name); + ret = nitz_apply_tzfile(timezone_name); nitz_set_iso(iso); } else { info("[TIMESTAMP] Fail to find timezone"); @@ -277,7 +277,7 @@ static gboolean __update_time(const struct tnoti_network_timeinfo *ti, tm_time.tm_wday = ti->wday; tm_time.tm_isdst = ti->dstoff; - newtime.tv_sec = timegm (&tm_time); + newtime.tv_sec = timegm(&tm_time); return nitz_set_time(newtime, curtime); } @@ -346,6 +346,7 @@ GList * nitz_get_tzlist(char *iso) info("[TIMESTAMP] ISO:[%s] OFFSET:[%d] DST:[%d] TZ:[%s] Hash:[%d]", iso, offset, in_dst, timezone_name, offset_hash); } uenum_close(enum_tz); + return tz_list; } -- 2.7.4