<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/14578">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils.h: require a semi colon after OSMO_ASSERT<br><br>When using `OSMO_ASSERT(exp);` clang will warn about<br>an empty expression because the semi colon was superflous.<br>Use do {} while (0) to enfore the need of a semi colon.<br>This might break other test.<br><br>Change-Id: I2272d29a81496164bebd1696a694383a28a86434<br>---<br>M include/osmocom/core/utils.h<br>M src/gsm/gsm0808_utils.c<br>M tests/ctrl/ctrl_test.c<br>3 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h</span><br><span>index 601bb56..8585a6a 100644</span><br><span>--- a/include/osmocom/core/utils.h</span><br><span>+++ b/include/osmocom/core/utils.h</span><br><span>@@ -98,9 +98,9 @@</span><br><span> * the predicate evaluates to false (0).</span><br><span> */</span><br><span> #define OSMO_ASSERT(exp) \</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(exp)) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ do if (!(exp)) { \</span><br><span> osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span> </span><br><span> /*! duplicate a string using talloc and release its prior content (if any)</span><br><span> * \param[in] ctx Talloc context to use for allocation</span><br><span>diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c</span><br><span>index afff59a..364a04f 100644</span><br><span>--- a/src/gsm/gsm0808_utils.c</span><br><span>+++ b/src/gsm/gsm0808_utils.c</span><br><span>@@ -273,7 +273,7 @@</span><br><span> case GSM0808_SCT_FR5:</span><br><span> case GSM0808_SCT_HR4:</span><br><span> case GSM0808_SCT_CSD:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT((sc->cfg & 0xff00) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT((sc->cfg & 0xff00) == 0);</span><br><span> msgb_put_u8(msg, (uint8_t) sc->cfg & 0xff);</span><br><span> break;</span><br><span> default:</span><br><span>@@ -874,7 +874,7 @@</span><br><span> </span><br><span> msgb_put_u8(msg, cil->id_discr & 0x0f);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(cil->id_list_len <= GSM0808_CELL_ID_LIST2_MAXLEN)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cil->id_list_len <= GSM0808_CELL_ID_LIST2_MAXLEN);</span><br><span> for (i = 0; i < cil->id_list_len; i++)</span><br><span> gsm0808_msgb_put_cell_id_u(msg, cil->id_discr, &cil->id_list[i]);</span><br><span> </span><br><span>@@ -906,7 +906,7 @@</span><br><span> </span><br><span> switch (cil->id_discr) {</span><br><span> case CELL_IDENT_LAC:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(cil->id_list_len <= CELL_ID_LIST_LAC_MAXLEN)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cil->id_list_len <= CELL_ID_LIST_LAC_MAXLEN);</span><br><span> for (i=0;i<cil->id_list_len;i++) {</span><br><span> msgb_put_u16(msg, cil->id_list_lac[i]);</span><br><span> }</span><br><span>diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c</span><br><span>index cffb803..b46e9ac 100644</span><br><span>--- a/tests/ctrl/ctrl_test.c</span><br><span>+++ b/tests/ctrl/ctrl_test.c</span><br><span>@@ -121,7 +121,7 @@</span><br><span> </span><br><span> printf("replied: '%s'\n", osmo_escape_str((char*)msgb_l2(sent_msg), -1));</span><br><span> OSMO_ASSERT(t->reply_str);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!strcmp(t->reply_str, (char*)msgb_l2(sent_msg)))</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(!strcmp(t->reply_str, (char*)msgb_l2(sent_msg)));</span><br><span> msgb_free(sent_msg);</span><br><span> }</span><br><span> osmo_wqueue_clear(&ccon->write_queue);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/14578">change 14578</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/libosmocore/+/14578"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2272d29a81496164bebd1696a694383a28a86434 </div>
<div style="display:none"> Gerrit-Change-Number: 14578 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>