<p>Michael Bradeen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16607">View Change</a></p><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><br>ASTERISK-29682<br>Reported by: George Joseph<br><br>Change-Id: If4fe42222c8444dc16828a42731ee53b4ce5cbbe<br>---<br>M channels/chan_skinny.c<br>M menuselect/Makefile<br>M tests/test_voicemail_api.c<br>3 files changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/07/16607/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c</span><br><span>index c908b61..7d1d510 100644</span><br><span>--- a/channels/chan_skinny.c</span><br><span>+++ b/channels/chan_skinny.c</span><br><span>@@ -313,7 +313,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_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><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16607">change 16607</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/+/16607"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: If4fe42222c8444dc16828a42731ee53b4ce5cbbe </div>
<div style="display:none"> Gerrit-Change-Number: 16607 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>