<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16571">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">various: Fix GCC 11 compilation issues.<br><br>test_voicemail_api: Use empty char* for empty_msg_ids.<br>chan_skinny: Fix size of calledParty to be maximum extension.<br>menuselect: Change Makefile to stop deprecated warnings. Added comments<br>test_linkedlist: 'bogus' variable was manually allocated from a macro<br>and the test fails if this happens but the compiler couldn't 'see' this<br>and returns a warning. memset to all 0's after allocation.<br>chan_ooh323: Fixed various indentation issues that triggered misleading<br> indentation warnings.<br><br>ASTERISK-29682<br>Reported by: George Joseph<br><br>Change-Id: If4fe42222c8444dc16828a42731ee53b4ce5cbbe<br>---<br>M addons/ooh323c/src/memheap.c<br>M addons/ooh323c/src/ooh323.c<br>M channels/chan_skinny.c<br>M menuselect/Makefile<br>M tests/test_linkedlists.c<br>M tests/test_voicemail_api.c<br>6 files changed, 33 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/addons/ooh323c/src/memheap.c b/addons/ooh323c/src/memheap.c</span><br><span>index 4020261..33be667 100644</span><br><span>--- a/addons/ooh323c/src/memheap.c</span><br><span>+++ b/addons/ooh323c/src/memheap.c</span><br><span>@@ -373,7 +373,7 @@</span><br><span> CHECKMEMBLOCK (pMemHeap, pMemBlk);</span><br><span> }</span><br><span> else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_mutex_unlock(&pMemHeap->pLock);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_mutex_unlock(&pMemHeap->pLock);</span><br><span> return NULL;</span><br><span> }</span><br><span> }</span><br><span>@@ -753,9 +753,10 @@</span><br><span> if (newMemBlk == 0)</span><br><span> return 0;</span><br><span> pMemLink->pMemBlk = newMemBlk;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span> return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> *(int*)(((char*)pMemLink) + sizeof (OSMemLink)) = nbytes_;</span><br><span> return pMemLink->pMemBlk;</span><br><span> }</span><br><span>@@ -1132,7 +1133,7 @@</span><br><span> RTMEMDIAG2 ("memHeapMarkSaved: the element 0x%x is "</span><br><span> "already free!\n", pElem);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_mutex_unlock(&pMemHeap->pLock);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_mutex_unlock(&pMemHeap->pLock);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1151,9 +1152,10 @@</span><br><span> CLEAR_SAVED (pMemBlk, pElem);</span><br><span> nsaved = pMemBlk->nsaved;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- ast_mutex_unlock(&pMemHeap->pLock);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_mutex_unlock(&pMemHeap->pLock);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> if (saved && nsaved > 0)</span><br><span> pMemLink->blockType |= RTMEMSAVED;</span><br><span>diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c</span><br><span>index be02f8f..ebdf75a 100644</span><br><span>--- a/addons/ooh323c/src/ooh323.c</span><br><span>+++ b/addons/ooh323c/src/ooh323.c</span><br><span>@@ -1062,16 +1062,17 @@</span><br><span> if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&</span><br><span> q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&</span><br><span> OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (alerting->m.h245AddressPresent)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (alerting->m.h245AddressPresent) {</span><br><span> OOTRACEINFO3("Tunneling and h245address provided."</span><br><span> "Giving preference to Tunneling (%s, %s)\n",</span><br><span> call->callType, call->callToken);</span><br><span style="color: hsl(0, 100%, 40%);">- if (call->h225version >= 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- ret =ooSendTCSandMSD(call);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret != OO_OK)</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (call->h225version >= 4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret =ooSendTCSandMSD(call);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret != OO_OK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if(alerting->m.h245AddressPresent) {</span><br><span> if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))</span><br><span> {</span><br><span>@@ -1314,15 +1315,17 @@</span><br><span> if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&</span><br><span> q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&</span><br><span> OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (progress->m.h245AddressPresent)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (progress->m.h245AddressPresent) {</span><br><span> OOTRACEINFO3("Tunneling and h245address provided."</span><br><span> "Giving preference to Tunneling (%s, %s)\n",</span><br><span> call->callType, call->callToken);</span><br><span style="color: hsl(0, 100%, 40%);">- if (call->h225version >= 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- ret =ooSendTCSandMSD(call);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret != OO_OK)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (call->h225version >= 4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret =ooSendTCSandMSD(call);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret != OO_OK) {</span><br><span> return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if(progress->m.h245AddressPresent) {</span><br><span> if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))</span><br><span> {</span><br><span>diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c</span><br><span>index 05ec46f..2966ea2 100644</span><br><span>--- a/channels/chan_skinny.c</span><br><span>+++ b/channels/chan_skinny.c</span><br><span>@@ -314,7 +314,7 @@</span><br><span> </span><br><span> #define ENBLOC_CALL_MESSAGE 0x0004</span><br><span> struct enbloc_call_message {</span><br><span style="color: hsl(0, 100%, 40%);">- char calledParty[24];</span><br><span style="color: hsl(120, 100%, 40%);">+ char calledParty[AST_MAX_EXTENSION];</span><br><span> };</span><br><span> </span><br><span> #define STIMULUS_MESSAGE 0x0005</span><br><span>diff --git a/menuselect/Makefile b/menuselect/Makefile</span><br><span>index c310c18..ba78275 100644</span><br><span>--- a/menuselect/Makefile</span><br><span>+++ b/menuselect/Makefile</span><br><span>@@ -22,7 +22,9 @@</span><br><span> </span><br><span> # Basic set of sources and flags/libraries/includes</span><br><span> OBJS:=menuselect.o strcompat.o</span><br><span style="color: hsl(0, 100%, 40%);">-CFLAGS+=-g -D_GNU_SOURCE -Wall</span><br><span style="color: hsl(120, 100%, 40%);">+# Adding -Wdeprecated-declarations to deal with internal deprecation warnings</span><br><span style="color: hsl(120, 100%, 40%);">+# from gtk+ for GTypeDebugFlags and GTimeVal deprecated in later glib versions</span><br><span style="color: hsl(120, 100%, 40%);">+CFLAGS+=-g -D_GNU_SOURCE -Wall -Wno-deprecated-declarations</span><br><span> </span><br><span> ifneq ($(findstring dragonfly,$(OSARCH)),)</span><br><span> CFLAGS += -isystem /usr/local/include</span><br><span>diff --git a/tests/test_linkedlists.c b/tests/test_linkedlists.c</span><br><span>index 5c3fceb..1b3ba79 100644</span><br><span>--- a/tests/test_linkedlists.c</span><br><span>+++ b/tests/test_linkedlists.c</span><br><span>@@ -148,6 +148,7 @@</span><br><span> if (!(bogus = ast_alloca(sizeof(*bogus)))) {</span><br><span> return AST_TEST_FAIL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(bogus, 0, sizeof(*bogus));</span><br><span> </span><br><span> if (AST_LIST_REMOVE(&test_list, bogus, list)) {</span><br><span> ast_test_status_update(test, "AST_LIST_REMOVE should safely return NULL for missing element from empty list\n");</span><br><span>diff --git a/tests/test_voicemail_api.c b/tests/test_voicemail_api.c</span><br><span>index e467572..2338e38 100644</span><br><span>--- a/tests/test_voicemail_api.c</span><br><span>+++ b/tests/test_voicemail_api.c</span><br><span>@@ -1156,7 +1156,7 @@</span><br><span> {</span><br><span> const char *inbox_msg_id;</span><br><span> const char *multi_msg_ids[2];</span><br><span style="color: hsl(0, 100%, 40%);">- const char *empty_msg_ids[] = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *empty_msg_ids = "";</span><br><span> </span><br><span> switch (cmd) {</span><br><span> case TEST_INIT:</span><br><span>@@ -1207,7 +1207,7 @@</span><br><span> VM_API_REMOVE_MESSAGE_OFF_NOMINAL("test_vm_api_2345", "default", 2, "INBOX", multi_msg_ids);</span><br><span> </span><br><span> ast_test_status_update(test, "Test removing no messages with no message numbers\n");</span><br><span style="color: hsl(0, 100%, 40%);">- VM_API_REMOVE_MESSAGE_OFF_NOMINAL("test_vm_api_1234", "default", 0, "INBOX", empty_msg_ids);</span><br><span style="color: hsl(120, 100%, 40%);">+ VM_API_REMOVE_MESSAGE_OFF_NOMINAL("test_vm_api_1234", "default", 0, "INBOX", &empty_msg_ids);</span><br><span> </span><br><span> ast_test_status_update(test, "Test removing multiple messages with an invalid size specifier\n");</span><br><span> VM_API_REMOVE_MESSAGE_OFF_NOMINAL("test_vm_api_2345", "default", -30, "INBOX", multi_msg_ids);</span><br><span>@@ -1330,7 +1330,7 @@</span><br><span> const char *inbox_msg_id;</span><br><span> const char *multi_msg_ids[4];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- const char *empty_msg_ids[] = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *empty_msg_ids = "";</span><br><span> </span><br><span> switch (cmd) {</span><br><span> case TEST_INIT:</span><br><span>@@ -1393,7 +1393,7 @@</span><br><span> VM_API_FORWARD_MESSAGE_OFF_NOMINAL("test_vm_api_1234", "default", "INBOX", "test_vm_api_2345", "default", NULL, 1, &inbox_msg_id, 0);</span><br><span> </span><br><span> ast_test_status_update(test, "Test forwarding when no messages are select\n");</span><br><span style="color: hsl(0, 100%, 40%);">- VM_API_FORWARD_MESSAGE_OFF_NOMINAL("test_vm_api_1234", "default", "INBOX", "test_vm_api_2345", "default", "INBOX", 0, empty_msg_ids, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ VM_API_FORWARD_MESSAGE_OFF_NOMINAL("test_vm_api_1234", "default", "INBOX", "test_vm_api_2345", "default", "INBOX", 0, &empty_msg_ids, 0);</span><br><span> </span><br><span> ast_test_status_update(test, "Test forwarding a message that doesn't exist\n");</span><br><span> inbox_msg_id = "POOPOO";</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16571">change 16571</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/16571"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If4fe42222c8444dc16828a42731ee53b4ce5cbbe </div>
<div style="display:none"> Gerrit-Change-Number: 16571 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-CC: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>