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 /channels | |
| parent | 1b468b543db6686879c4e004d8172d475c13d25b (diff) | |
build: A few gcc 7 error fixes
Change-Id: I7b5300fbf1af7d88d47129db13ad6dbdc9b553ec
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 3 | ||||
| -rw-r--r-- | channels/sig_pri.c | 8 | ||||
| -rw-r--r-- | channels/sig_pri.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 4f717ffac..828753a05 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -60,6 +60,7 @@ #include <signal.h> #include <sys/stat.h> #include <math.h> +#include <sys/sysmacros.h> #include "sig_analog.h" /* Analog signaling is currently still present in chan_dahdi for use with @@ -14210,7 +14211,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 */ |