diff options
| author | George Joseph <gjoseph@digium.com> | 2017-09-25 06:25:06 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-09-25 07:32:14 -0500 |
| commit | 4275ca16a147c1772a700c1cfda3983ecec6c79d (patch) | |
| tree | 4bbee51631065f0a7aba351fb8d12cff93fdb7e2 /apps/app_meetme.c | |
| parent | 1b468b543db6686879c4e004d8172d475c13d25b (diff) | |
build: A few gcc 7 error fixes
Change-Id: I7b5300fbf1af7d88d47129db13ad6dbdc9b553ec
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index d98c418c3..7ca9ba39f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2251,20 +2251,23 @@ static char *sla_show_stations(struct ast_cli_entry *e, int cmd, struct ast_cli_ if (trunk_ref->ring_timeout) { snprintf(ring_timeout, sizeof(ring_timeout), "%u", trunk_ref->ring_timeout); - } else + } else { strcpy(ring_timeout, "(none)"); + } if (trunk_ref->ring_delay) { snprintf(ring_delay, sizeof(ring_delay), "%u", trunk_ref->ring_delay); - } else + } else { strcpy(ring_delay, "(none)"); - ast_cli(a->fd, "=== ==> Trunk Name: %s\n" - "=== ==> State: %s\n" - "=== ==> RingTimeout: %s\n" - "=== ==> RingDelay: %s\n", - trunk_ref->trunk->name, - trunkstate2str(trunk_ref->state), - ring_timeout, ring_delay); + } + + ast_cli(a->fd, "=== ==> Trunk Name: %s\n" + "=== ==> State: %s\n" + "=== ==> RingTimeout: %s\n" + "=== ==> RingDelay: %s\n", + trunk_ref->trunk->name, + trunkstate2str(trunk_ref->state), + ring_timeout, ring_delay); } ast_cli(a->fd, "=== ---------------------------------------------------------\n" "===\n"); @@ -3199,7 +3202,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc const char *agifiledefault = "conf-background.agi", *tmpvar; char meetmesecs[30] = ""; char exitcontext[AST_MAX_CONTEXT] = ""; - char recordingtmp[AST_MAX_EXTENSION] = ""; + char recordingtmp[AST_MAX_EXTENSION * 2] = ""; char members[10] = ""; int dtmf = 0, opt_waitmarked_timeout = 0; time_t timeout = 0; @@ -4517,7 +4520,7 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char char currenttime[32] = ""; char eatime[32] = ""; char bookid[51] = ""; - char recordingtmp[AST_MAX_EXTENSION] = ""; + char recordingtmp[AST_MAX_EXTENSION * 2] = ""; char useropts[OPTIONS_LEN + 1] = ""; /* Used for RealTime conferences */ char adminopts[OPTIONS_LEN + 1] = ""; struct ast_tm tm, etm; |