<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16659">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Benjamin Keith Ford: 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.2 compilation issues.<br><br>* Initialize some variables that are never used anyway.<br><br>* Use valid pointers instead of integers cast to void pointers when<br> calling pthread_setspecific().<br><br>ASTERISK-29711 #close<br>ASTERISK-29713 #close<br><br>Change-Id: I8728cd6f2f4b28e0e48113c5da450b768c2a6683<br>---<br>M main/channel.c<br>M main/logger.c<br>M utils/extconf.c<br>3 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/channel.c b/main/channel.c</span><br><span>index 9104ef8..9239630 100644</span><br><span>--- a/main/channel.c</span><br><span>+++ b/main/channel.c</span><br><span>@@ -10344,7 +10344,7 @@</span><br><span> int status;</span><br><span> </span><br><span> status = ast_threadstorage_set_ptr(&in_intercept_routine,</span><br><span style="color: hsl(0, 100%, 40%);">- in_intercept_mode ? (void *) 1 : (void *) 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ in_intercept_mode ? &(int) { 1 } : NULL);</span><br><span> if (status) {</span><br><span> ast_log(LOG_ERROR, "Failed to set dialplan intercept mode\n");</span><br><span> }</span><br><span>diff --git a/main/logger.c b/main/logger.c</span><br><span>index 6b0e76f..126a74d 100644</span><br><span>--- a/main/logger.c</span><br><span>+++ b/main/logger.c</span><br><span>@@ -2213,7 +2213,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ast_threadstorage_set_ptr(&in_safe_log, (void*)1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_threadstorage_set_ptr(&in_safe_log, &(int) { 1 })) {</span><br><span> /* We've failed to set the flag that protects against</span><br><span> * recursion, so bail. */</span><br><span> return;</span><br><span>diff --git a/utils/extconf.c b/utils/extconf.c</span><br><span>index afc893c..2da33a8 100644</span><br><span>--- a/utils/extconf.c</span><br><span>+++ b/utils/extconf.c</span><br><span>@@ -2863,8 +2863,8 @@</span><br><span> </span><br><span> static struct ast_config *ast_config_internal_load(const char *filename, struct ast_config *cfg, int withcomments, const char *suggested_incl_file)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char db[256];</span><br><span style="color: hsl(0, 100%, 40%);">- char table[256];</span><br><span style="color: hsl(120, 100%, 40%);">+ char db[256] = "";</span><br><span style="color: hsl(120, 100%, 40%);">+ char table[256] = "";</span><br><span> struct ast_config_engine *loader = &text_file_engine;</span><br><span> struct ast_config *result;</span><br><span> </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/+/16659">change 16659</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/+/16659"/><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: I8728cd6f2f4b28e0e48113c5da450b768c2a6683 </div>
<div style="display:none"> Gerrit-Change-Number: 16659 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.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-MessageType: merged </div>