<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/12881">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Sean Bright: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_dahdi: Fix build with clang/llvm<br><br>On FreeBSD using the clang/llvm compiler build fails to build due<br>to the switch statement argument being a non integer type expression.<br>Switch to an if/else if/else construct to sidestep the issue.<br><br>ASTERISK-28536 #close<br><br>Change-Id: Idf4a82cc1e94580a2d017fe9e351c226f23e20c8<br>---<br>M channels/chan_dahdi.c<br>1 file changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c</span><br><span>index 0fff4b1..1fca4ba 100644</span><br><span>--- a/channels/chan_dahdi.c</span><br><span>+++ b/channels/chan_dahdi.c</span><br><span>@@ -15158,10 +15158,12 @@</span><br><span> int channo;</span><br><span> int prev_channo;</span><br><span> x++;</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mfcr2->r2master) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 0L: thread_status = "zero"; break;</span><br><span style="color: hsl(0, 100%, 40%);">- case AST_PTHREADT_NULL: thread_status = "none"; break;</span><br><span style="color: hsl(0, 100%, 40%);">- default: thread_status = "created"; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mfcr2->r2master == 0L) {</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_status = "zero";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (mfcr2->r2master == AST_PTHREADT_NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_status = "none";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_status = "created";</span><br><span> }</span><br><span> snprintf(index, sizeof(index), "%d", mfcr2->index);</span><br><span> snprintf(live_chans_str, sizeof(live_chans_str), "%d", mfcr2->live_chans);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/12881">change 12881</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/+/12881"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17.0 </div>
<div style="display:none"> Gerrit-Change-Id: Idf4a82cc1e94580a2d017fe9e351c226f23e20c8 </div>
<div style="display:none"> Gerrit-Change-Number: 12881 </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: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>