<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6584">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Matthew Fredrickson: Looks good to me, but someone else must approve
Richard Mudgett: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build: A few gcc 7 error fixes<br><br>Change-Id: I7b5300fbf1af7d88d47129db13ad6dbdc9b553ec<br>---<br>M apps/app_meetme.c<br>M channels/chan_dahdi.c<br>M channels/sig_pri.c<br>M channels/sig_pri.h<br>4 files changed, 21 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/app_meetme.c b/apps/app_meetme.c<br>index be45394..ad66464 100644<br>--- a/apps/app_meetme.c<br>+++ b/apps/app_meetme.c<br>@@ -2254,20 +2254,23 @@<br> if (trunk_ref->ring_timeout) {<br> snprintf(ring_timeout, sizeof(ring_timeout),<br> "%u", trunk_ref->ring_timeout);<br>- } else<br>+ } else {<br> strcpy(ring_timeout, "(none)");<br>+ }<br> if (trunk_ref->ring_delay) {<br> snprintf(ring_delay, sizeof(ring_delay),<br> "%u", trunk_ref->ring_delay);<br>- } else<br>+ } else {<br> strcpy(ring_delay, "(none)");<br>- ast_cli(a->fd, "=== ==> Trunk Name: %s\n"<br>- "=== ==> State: %s\n"<br>- "=== ==> RingTimeout: %s\n"<br>- "=== ==> RingDelay: %s\n",<br>- trunk_ref->trunk->name,<br>- trunkstate2str(trunk_ref->state),<br>- ring_timeout, ring_delay);<br>+ }<br>+<br>+ ast_cli(a->fd, "=== ==> Trunk Name: %s\n"<br>+ "=== ==> State: %s\n"<br>+ "=== ==> RingTimeout: %s\n"<br>+ "=== ==> RingDelay: %s\n",<br>+ trunk_ref->trunk->name,<br>+ trunkstate2str(trunk_ref->state),<br>+ ring_timeout, ring_delay);<br> }<br> ast_cli(a->fd, "=== ---------------------------------------------------------\n"<br> "===\n");<br>@@ -3202,7 +3205,7 @@<br> const char *agifiledefault = "conf-background.agi", *tmpvar;<br> char meetmesecs[30] = "";<br> char exitcontext[AST_MAX_CONTEXT] = "";<br>- char recordingtmp[AST_MAX_EXTENSION] = "";<br>+ char recordingtmp[AST_MAX_EXTENSION * 2] = "";<br> char members[10] = "";<br> int dtmf = 0, opt_waitmarked_timeout = 0;<br> time_t timeout = 0;<br>@@ -4520,7 +4523,7 @@<br> char currenttime[32] = "";<br> char eatime[32] = "";<br> char bookid[51] = "";<br>- char recordingtmp[AST_MAX_EXTENSION] = "";<br>+ char recordingtmp[AST_MAX_EXTENSION * 2] = "";<br> char useropts[OPTIONS_LEN + 1] = ""; /* Used for RealTime conferences */<br> char adminopts[OPTIONS_LEN + 1] = "";<br> struct ast_tm tm, etm;<br>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c<br>index 55a9dba..a6b0fda 100644<br>--- a/channels/chan_dahdi.c<br>+++ b/channels/chan_dahdi.c<br>@@ -62,6 +62,7 @@<br> #include <signal.h><br> #include <sys/stat.h><br> #include <math.h><br>+#include <sys/sysmacros.h><br> <br> #include "sig_analog.h"<br> /* Analog signaling is currently still present in chan_dahdi for use with<br>@@ -14317,7 +14318,7 @@<br> int trunkgroup;<br> int x, y, fd = a->fd;<br> int interfaceid = 0;<br>- char db_chan_name[20], db_answer[5];<br>+ char db_chan_name[20], db_answer[15];<br> struct dahdi_pvt *tmp;<br> struct dahdi_pri *pri;<br> <br>diff --git a/channels/sig_pri.c b/channels/sig_pri.c<br>index 1b228af..fbc4e40 100644<br>--- a/channels/sig_pri.c<br>+++ b/channels/sig_pri.c<br>@@ -2040,7 +2040,7 @@<br> struct sig_pri_chan *pvt = v_pvt;<br> struct ast_channel *chan = pvt->owner;<br> struct ast_frame *f;<br>- char ex[80];<br>+ char ex[128];<br> /* Wait up to 30 seconds for an answer */<br> int timeout_ms = 30000;<br> int ms;<br>@@ -2279,7 +2279,7 @@<br> */<br> 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)<br> {<br>- char number[AST_MAX_EXTENSION];<br>+ char number[AST_MAX_EXTENSION * 2];<br> <br> apply_plan_to_existing_number(number, sizeof(number), pri, pri_number->str,<br> pri_number->plan);<br>@@ -6233,7 +6233,7 @@<br> struct timeval lastidle = { 0, 0 };<br> pthread_t p;<br> struct ast_channel *idle;<br>- char idlen[80];<br>+ char idlen[128];<br> int nextidle = -1;<br> int haveidles;<br> int activeidles;<br>@@ -6639,7 +6639,7 @@<br> e->service_ack.changestatus, PRI_SPAN(e->service_ack.channel), PRI_CHANNEL(e->service_ack.channel), pri->span);<br> } else {<br> char db_chan_name[20];<br>- char db_answer[5];<br>+ char db_answer[15];<br> int ch;<br> unsigned *why;<br> <br>diff --git a/channels/sig_pri.h b/channels/sig_pri.h<br>index d3e5350..8c9babd 100644<br>--- a/channels/sig_pri.h<br>+++ b/channels/sig_pri.h<br>@@ -300,7 +300,7 @@<br> char cid_name[AST_MAX_EXTENSION];<br> char cid_ani[AST_MAX_EXTENSION];<br> /*! \brief User tag for party id's sent from this device driver. */<br>- char user_tag[AST_MAX_EXTENSION];<br>+ char user_tag[AST_MAX_EXTENSION * 2];<br> char exten[AST_MAX_EXTENSION];<br> <br> /* Internal variables -- Don't touch */<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6584">change 6584</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/6584"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7b5300fbf1af7d88d47129db13ad6dbdc9b553ec </div>
<div style="display:none"> Gerrit-Change-Number: 6584 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>