diff options
| author | George Joseph <gjoseph@digium.com> | 2016-06-28 07:22:24 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-06-28 12:40:49 -0500 |
| commit | 651290a80902f1ba095f343f0e5c75e61a3ccd7c (patch) | |
| tree | 6b7b4841dcf0eee73930f2ea17c5e5350dd09e19 /main/say.c | |
| parent | 46cc7f114d28e443d48df056c43cbb5f7a197924 (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/say.c')
| -rw-r--r-- | main/say.c | 16 |
1 files changed, 9 insertions, 7 deletions
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 */ |