From 31cbc1166c9db259b4bc8fe058c78c397f4df742 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Mon, 25 Sep 2017 06:25:06 -0600 Subject: build: A few gcc 7 error fixes Change-Id: I7b5300fbf1af7d88d47129db13ad6dbdc9b553ec --- apps/app_meetme.c | 25 ++++++++++++++----------- channels/chan_dahdi.c | 3 ++- channels/sig_pri.c | 8 ++++---- channels/sig_pri.h | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index be4539488..ad6646423 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2254,20 +2254,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"); @@ -3202,7 +3205,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; @@ -4520,7 +4523,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; diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 55a9dbaf4..a6b0fda77 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -62,6 +62,7 @@ ASTERISK_REGISTER_FILE() #include #include #include +#include #include "sig_analog.h" /* Analog signaling is currently still present in chan_dahdi for use with @@ -14317,7 +14318,7 @@ static char *handle_pri_service_generic(struct ast_cli_entry *e, int cmd, struct int trunkgroup; int x, y, fd = a->fd; int interfaceid = 0; - char db_chan_name[20], db_answer[5]; + char db_chan_name[20], db_answer[15]; struct dahdi_pvt *tmp; struct dahdi_pri *pri; diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 1b228af99..fbc4e40f0 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -2040,7 +2040,7 @@ static void *do_idle_thread(void *v_pvt) struct sig_pri_chan *pvt = v_pvt; struct ast_channel *chan = pvt->owner; struct ast_frame *f; - char ex[80]; + char ex[128]; /* Wait up to 30 seconds for an answer */ int timeout_ms = 30000; int ms; @@ -2279,7 +2279,7 @@ static void sig_pri_party_name_convert(struct ast_party_name *ast_name, const st */ static void sig_pri_party_number_convert(struct ast_party_number *ast_number, const struct pri_party_number *pri_number, struct sig_pri_span *pri) { - char number[AST_MAX_EXTENSION]; + char number[AST_MAX_EXTENSION * 2]; apply_plan_to_existing_number(number, sizeof(number), pri, pri_number->str, pri_number->plan); @@ -6233,7 +6233,7 @@ static void *pri_dchannel(void *vpri) struct timeval lastidle = { 0, 0 }; pthread_t p; struct ast_channel *idle; - char idlen[80]; + char idlen[128]; int nextidle = -1; int haveidles; int activeidles; @@ -6639,7 +6639,7 @@ static void *pri_dchannel(void *vpri) e->service_ack.changestatus, PRI_SPAN(e->service_ack.channel), PRI_CHANNEL(e->service_ack.channel), pri->span); } else { char db_chan_name[20]; - char db_answer[5]; + char db_answer[15]; int ch; unsigned *why; diff --git a/channels/sig_pri.h b/channels/sig_pri.h index d3e5350c8..8c9babd4e 100644 --- a/channels/sig_pri.h +++ b/channels/sig_pri.h @@ -300,7 +300,7 @@ struct sig_pri_chan { char cid_name[AST_MAX_EXTENSION]; char cid_ani[AST_MAX_EXTENSION]; /*! \brief User tag for party id's sent from this device driver. */ - char user_tag[AST_MAX_EXTENSION]; + char user_tag[AST_MAX_EXTENSION * 2]; char exten[AST_MAX_EXTENSION]; /* Internal variables -- Don't touch */ -- cgit v1.2.3