[asterisk-commits] BuildSystem: Fix a few issues hightlighted by gcc 6.x (asterisk[certified/13.8])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jun 28 16:45:00 CDT 2016
Joshua Colp has submitted this change and it was merged.
Change subject: BuildSystem: Fix a few issues hightlighted by gcc 6.x
......................................................................
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
---
M channels/chan_unistim.c
M funcs/func_env.c
M main/say.c
M main/stdtime/localtime.c
4 files changed, 19 insertions(+), 14 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Verified
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 4d7f32c..22db104 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -568,8 +568,10 @@
{ 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 3c260a2..072714f 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -624,7 +624,7 @@
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 @@
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 ef80dfa..00b8b28 100644
--- a/main/say.c
+++ b/main/say.c
@@ -5201,13 +5201,14 @@
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':
@@ -5227,11 +5228,12 @@
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 702edbe..9cdf614 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1849,13 +1849,14 @@
*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) {
--
To view, visit https://gerrit.asterisk.org/3101
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6664d8f34a45bc1481d2a854481c7878b0c1cf8e
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: certified/13.8
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
More information about the asterisk-commits
mailing list