summaryrefslogtreecommitdiff
path: root/main/stdtime
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2016-06-28 07:22:24 -0600
committerGeorge Joseph <gjoseph@digium.com>2016-06-28 12:40:49 -0500
commit651290a80902f1ba095f343f0e5c75e61a3ccd7c (patch)
tree6b7b4841dcf0eee73930f2ea17c5e5350dd09e19 /main/stdtime
parent46cc7f114d28e443d48df056c43cbb5f7a197924 (diff)
BuildSystem: Fix a few issues hightlighted by gcc 6.x
gcc 6.1.1 caught a few more issues. Made sure the unit tests still pass for the func_env and stdtime issues. ASTERISK-26157 #close Change-Id: I6664d8f34a45bc1481d2a854481c7878b0c1cf8e
Diffstat (limited to 'main/stdtime')
-rw-r--r--main/stdtime/localtime.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index c10b7af62..c946c5fa8 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1849,13 +1849,14 @@ void ast_get_dst_info(const time_t * const timep, int *dst_enabled, time_t *dst_
*dst_enabled = 0;
/* Find where I can get gmtoff */
i = 0;
- while (sp->ttis[i].tt_isdst)
+ while (sp->ttis[i].tt_isdst) {
if (++i >= sp->typecnt) {
- i = 0;
- break;
+ i = 0;
+ break;
}
- *gmt_off = sp->ttis[i].tt_gmtoff;
- return;
+ }
+ *gmt_off = sp->ttis[i].tt_gmtoff;
+ return;
}
for (i = 1; i < sp->timecnt; ++i) {