<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9292">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: gscon: drop odd use of OSMO_STRINGIFY<br><br>Do not invoke OSMO_STRINGIFY() with arbitrary names, just quote instead.<br><br>The idea was that OSMO_STRINGIFY() avoids typos by ensuring well-defined names<br>are stringified, but this highlights that OSMO_STRINGIFY() is in fact usable<br>with completely arbitrary arguments and actually lacks the validation part :/<br><br>Change-Id: I458cd2cd0d6ddb0e6db3bb8d546a20336ae8c5f1<br>---<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>1 file changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index 2ae4b33..d2d2095 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -820,19 +820,19 @@</span><br><span> </span><br><span> static const struct osmo_fsm_state gscon_fsm_states[] = {</span><br><span> [ST_INIT] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(INIT),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "INIT",</span><br><span> .in_event_mask = S(GSCON_EV_A_CONN_REQ) | S(GSCON_EV_A_CONN_IND),</span><br><span> .out_state_mask = S(ST_WAIT_CC),</span><br><span> .action = gscon_fsm_init,</span><br><span> },</span><br><span> [ST_WAIT_CC] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_CC),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_CC",</span><br><span> .in_event_mask = S(GSCON_EV_A_CONN_CFM),</span><br><span> .out_state_mask = S(ST_ACTIVE),</span><br><span> .action = gscon_fsm_wait_cc,</span><br><span> },</span><br><span> [ST_ACTIVE] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(ACTIVE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "ACTIVE",</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_A_ASSIGNMENT_CMD) |</span><br><span> S(GSCON_EV_A_HO_REQ) | S(GSCON_EV_HO_START),</span><br><span> .out_state_mask = S(ST_CLEARING) | S(ST_WAIT_CRCX_BTS) | S(ST_WAIT_ASS_CMPL) |</span><br><span>@@ -840,31 +840,31 @@</span><br><span> .action = gscon_fsm_active,</span><br><span> },</span><br><span> [ST_WAIT_CRCX_BTS] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_CRCX_BTS),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_CRCX_BTS",</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_BTS),</span><br><span> .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_ASS_CMPL),</span><br><span> .action = gscon_fsm_wait_crcx_bts,</span><br><span> },</span><br><span> [ST_WAIT_ASS_CMPL] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_ASS_CMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_ASS_CMPL",</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_ASS_COMPL) | S(GSCON_EV_RR_ASS_FAIL),</span><br><span> .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS),</span><br><span> .action = gscon_fsm_wait_ass_cmpl,</span><br><span> },</span><br><span> [ST_WAIT_MDCX_BTS] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_MDCX_BTS),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_MDCX_BTS",</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS),</span><br><span> .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CRCX_MSC),</span><br><span> .action = gscon_fsm_wait_mdcx_bts,</span><br><span> },</span><br><span> [ST_WAIT_CRCX_MSC] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_CRCX_MSC),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_CRCX_MSC",</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_MSC),</span><br><span> .out_state_mask = S(ST_ACTIVE),</span><br><span> .action = gscon_fsm_wait_crcx_msc,</span><br><span> },</span><br><span> [ST_CLEARING] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(CLEARING),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "CLEARING",</span><br><span> .in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL),</span><br><span> .action = gscon_fsm_clearing,</span><br><span> },</span><br><span>@@ -873,27 +873,27 @@</span><br><span> * program flow in handover_logic.c a bit and handle some of the logic</span><br><span> * here? */</span><br><span> [ST_WAIT_MT_HO_ACC] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_MT_HO_ACC),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_MT_HO_ACC",</span><br><span> },</span><br><span> [ST_WAIT_MT_HO_COMPL] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_MT_HO_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_MT_HO_COMPL",</span><br><span> },</span><br><span> [ST_WAIT_MO_HO_CMD] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_MO_HO_CMD),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_MO_HO_CMD",</span><br><span> },</span><br><span> [ST_MO_HO_PROCEEDING] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(MO_HO_PROCEEDING),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "MO_HO_PROCEEDING",</span><br><span> },</span><br><span> </span><br><span> /* Internal handover */</span><br><span> [ST_WAIT_HO_COMPL] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_HO_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_HO_COMPL",</span><br><span> .in_event_mask = S(GSCON_EV_HO_COMPL) | S(GSCON_EV_HO_FAIL) | S(GSCON_EV_HO_TIMEOUT),</span><br><span> .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS_HO) | S(ST_CLEARING),</span><br><span> .action = gscon_fsm_wait_ho_compl,</span><br><span> },</span><br><span> [ST_WAIT_MDCX_BTS_HO] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_MDCX_BTS_HO),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "WAIT_MDCX_BTS_HO",</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS),</span><br><span> .action = gscon_fsm_wait_mdcx_bts_ho,</span><br><span> .out_state_mask = S(ST_ACTIVE),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9292">change 9292</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/9292"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I458cd2cd0d6ddb0e6db3bb8d546a20336ae8c5f1 </div>
<div style="display:none"> Gerrit-Change-Number: 9292 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>