diff options
| author | George Joseph <gjoseph@digium.com> | 2016-06-28 07:22:24 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-06-28 13:56:38 -0500 |
| commit | f3d236ca7fdf8b03106f1e50474ff6a79f3efb20 (patch) | |
| tree | f274507a2b7b2e10580db46fe87d9b50b6ae0bb9 /main/stdtime | |
| parent | 73e2186195b4cd1cc764346b58b209ba1b7223bb (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.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 702edbe85..9cdf614d5 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) { |