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 /main/say.c | |
| parent | 83f2c2573bdf680caeafdab0f31f331fe7fa6609 (diff) | |
| parent | 651290a80902f1ba095f343f0e5c75e61a3ccd7c (diff) | |
Merge "BuildSystem: Fix a few issues hightlighted by gcc 6.x"
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 */ |