kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: A few gcc 7 error fixes

Browse Source 
Change-Id: I7b5300fbf1af7d88d47129db13ad6dbdc9b553ec
This commit is contained in:
George Joseph
2017-09-25 06:25:06 -06:00
parent 1b468b543d
commit 4275ca16a1
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/app_meetme.c
View File

@@ -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;