diff options
author | Joshua Colp <jcolp@digium.com> | 2016-06-28 14:57:06 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-06-28 14:57:06 -0500 |
commit | 541f0386941d536059dd4ab9b1fecce547bda71c (patch) | |
tree | 636c5db33ea9c64ad42c47d69b0d3e2a65f05f29 | |
parent | 83f2c2573bdf680caeafdab0f31f331fe7fa6609 (diff) | |
parent | 651290a80902f1ba095f343f0e5c75e61a3ccd7c (diff) |
Merge "BuildSystem: Fix a few issues hightlighted by gcc 6.x"
-rw-r--r-- | channels/chan_unistim.c | 2 | ||||
-rw-r--r-- | funcs/func_env.c | 4 | ||||
-rw-r--r-- | main/say.c | 16 | ||||
-rw-r--r-- | main/stdtime/localtime.c | 11 |
4 files changed, 19 insertions, 14 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 973f3522b..5b64f963b 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -567,8 +567,10 @@ static const unsigned char packet_send_stream_based_tone_off[] = { 0x16, 0x05, 0x1c, 0x00, 0x00 }; static const unsigned char packet_send_mute[] = { 0x16, 0x05, 0x04, 0x00, 0x00 }; +#ifdef NOT_USED static const unsigned char packet_send_CloseAudioStreamRX[] = { 0x16, 0x05, 0x31, 0x00, 0xff }; static const unsigned char packet_send_CloseAudioStreamTX[] = { 0x16, 0x05, 0x31, 0xff, 0x00 }; +#endif static const unsigned char packet_send_stream_based_tone_on[] = { 0x16, 0x06, 0x1b, 0x00, 0x00, 0x05 }; static const unsigned char packet_send_stream_based_tone_single_freq[] = diff --git a/funcs/func_env.c b/funcs/func_env.c index 8f9753aaa..3883de601 100644 --- a/funcs/func_env.c +++ b/funcs/func_env.c @@ -624,7 +624,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru ast_log(LOG_ERROR, "Cannot seek to offset %" PRId64 ": %s\n", i, strerror(errno)); } end = fread(fbuf, 1, sizeof(fbuf), ff); - for (pos = (end < sizeof(fbuf) ? fbuf + end - 1 : fbuf + sizeof(fbuf) - 1); pos > fbuf - 1; pos--) { + for (pos = (end < sizeof(fbuf) ? fbuf + end - 1 : fbuf + sizeof(fbuf) - 1); pos >= fbuf; pos--) { LINE_COUNTER(pos, format, count); if (length < 0 && count * -1 == length) { @@ -1024,7 +1024,7 @@ static int file_write(struct ast_channel *chan, const char *cmd, char *data, con fclose(ff); return -1; } - for (pos = fbuf + sizeof(fbuf) - 1; pos > fbuf - 1; pos--) { + for (pos = fbuf + sizeof(fbuf) - 1; pos >= fbuf; pos--) { LINE_COUNTER(pos, newline_format, count); if (length < 0 && count * -1 == length) { diff --git a/main/say.c b/main/say.c index e4e374329..9f6f1eacb 100644 --- a/main/say.c +++ b/main/say.c @@ -5774,13 +5774,14 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char * case 'I': case 'l': /* 12-Hour */ - if (tm.tm_hour == 0) + if (tm.tm_hour == 0) { ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg)); - else if (tm.tm_hour > 12) + } else if (tm.tm_hour > 12) { snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12); - else + } else { snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour); - res = wait_file(chan, ints, nextmsg, lang); + } + res = wait_file(chan, ints, nextmsg, lang); break; case 'H': case 'k': @@ -5800,11 +5801,12 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char * case 'P': case 'p': /* AM/PM */ - if (tm.tm_hour > 11) + if (tm.tm_hour > 11) { ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg)); - else + } else { ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg)); - res = wait_file(chan, ints, nextmsg, lang); + } + res = wait_file(chan, ints, nextmsg, lang); break; case 'Q': /* Shorthand for "Today", "Yesterday", or ABdY */ 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) { |