<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26134">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">for linter: s/while(0)/while (0)<br><br>Change-Id: Ib422e7d1a7d543dcd8738581839ce55bb8fc29d2<br>---<br>M include/osmocom/bsc/assignment_fsm.h<br>M include/osmocom/bsc/handover.h<br>M include/osmocom/bsc/lchan_fsm.h<br>M include/osmocom/bsc/lchan_rtp_fsm.h<br>M include/osmocom/bsc/lcs_loc_req.h<br>M include/osmocom/bsc/lcs_ta_req.h<br>M include/osmocom/bsc/timeslot_fsm.h<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/handover_decision_2.c<br>M src/osmo-bsc/handover_fsm.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>M src/osmo-bsc/lcs_loc_req.c<br>M src/osmo-bsc/lcs_ta_req.c<br>14 files changed, 22 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/assignment_fsm.h b/include/osmocom/bsc/assignment_fsm.h</span><br><span>index 3a64f7d..6c429e4 100644</span><br><span>--- a/include/osmocom/bsc/assignment_fsm.h</span><br><span>+++ b/include/osmocom/bsc/assignment_fsm.h</span><br><span>@@ -17,7 +17,7 @@</span><br><span> conn->assignment.new_lchan ? " of " : "", \</span><br><span> conn->assignment.new_lchan ? gsm_lchan_name(conn->assignment.new_lchan) : "", \</span><br><span> ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> enum assignment_fsm_state {</span><br><span> ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE,</span><br><span>diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h</span><br><span>index f671491..58fea35 100644</span><br><span>--- a/include/osmocom/bsc/handover.h</span><br><span>+++ b/include/osmocom/bsc/handover.h</span><br><span>@@ -17,7 +17,7 @@</span><br><span> else \</span><br><span> LOGP(DHODEC, level, "%s: " fmt, \</span><br><span> handover_status(conn), ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> struct gsm_network;</span><br><span> struct gsm_lchan;</span><br><span>diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h</span><br><span>index fa0d299..eb8312e 100644</span><br><span>--- a/include/osmocom/bsc/lchan_fsm.h</span><br><span>+++ b/include/osmocom/bsc/lchan_fsm.h</span><br><span>@@ -10,14 +10,14 @@</span><br><span> LOGPFSML((lchan)->fi, level, "(type=%s) " fmt, gsm_lchant_name((lchan)->type), ## args); \</span><br><span> else \</span><br><span> LOGP(DRSL, level, "%s (not initialized) " fmt, gsm_lchan_name(lchan), ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> #define LCHAN_SET_LAST_ERROR(LCHAN, fmt, args...) do { \</span><br><span> if ((LCHAN)->last_error) \</span><br><span> talloc_free((LCHAN)->last_error); \</span><br><span> (LCHAN)->last_error = talloc_asprintf((LCHAN)->ts->trx, fmt, ##args); \</span><br><span> LOG_LCHAN(LCHAN, LOGL_ERROR, "%s\n", (LCHAN)->last_error); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> enum lchan_fsm_state {</span><br><span> LCHAN_ST_UNUSED,</span><br><span>diff --git a/include/osmocom/bsc/lchan_rtp_fsm.h b/include/osmocom/bsc/lchan_rtp_fsm.h</span><br><span>index 6ff8fe3..18ab348 100644</span><br><span>--- a/include/osmocom/bsc/lchan_rtp_fsm.h</span><br><span>+++ b/include/osmocom/bsc/lchan_rtp_fsm.h</span><br><span>@@ -7,7 +7,7 @@</span><br><span> else \</span><br><span> LOGP(DLMGCP, level, "%s (not initialized) " fmt, gsm_lchan_name(lchan), \</span><br><span> ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> struct gsm_lchan;</span><br><span> struct mgcp_conn_peer;</span><br><span>diff --git a/include/osmocom/bsc/lcs_loc_req.h b/include/osmocom/bsc/lcs_loc_req.h</span><br><span>index ba677e8..86540f2 100644</span><br><span>--- a/include/osmocom/bsc/lcs_loc_req.h</span><br><span>+++ b/include/osmocom/bsc/lcs_loc_req.h</span><br><span>@@ -8,7 +8,7 @@</span><br><span> LOGPFSML((LOC_REQ)->fi, level, fmt, ## args); \</span><br><span> else \</span><br><span> LOGP(DLCS, level, "LCS Perf Loc Req: " fmt, ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> struct lcs_ta_req;</span><br><span> </span><br><span>diff --git a/include/osmocom/bsc/lcs_ta_req.h b/include/osmocom/bsc/lcs_ta_req.h</span><br><span>index b9b7a4e..bdfc14f 100644</span><br><span>--- a/include/osmocom/bsc/lcs_ta_req.h</span><br><span>+++ b/include/osmocom/bsc/lcs_ta_req.h</span><br><span>@@ -11,7 +11,7 @@</span><br><span> LOGPFSML((TA_REQ)->fi, level, fmt, ## args); \</span><br><span> else \</span><br><span> LOGP(DLCS, level, "LCS TA Req: " fmt, ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> enum lcs_ta_req_fsm_event {</span><br><span> LCS_TA_REQ_EV_GOT_TA,</span><br><span>diff --git a/include/osmocom/bsc/timeslot_fsm.h b/include/osmocom/bsc/timeslot_fsm.h</span><br><span>index 5e62188..526f3cf 100644</span><br><span>--- a/include/osmocom/bsc/timeslot_fsm.h</span><br><span>+++ b/include/osmocom/bsc/timeslot_fsm.h</span><br><span>@@ -17,7 +17,7 @@</span><br><span> gsm_ts_name(ts), \</span><br><span> ## args, \</span><br><span> (!fmt || !*fmt || fmt[strlen(fmt)-1] != '\n') ? "\n" : ""); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> enum ts_fsm_state {</span><br><span> TS_ST_NOT_INITIALIZED,</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index f9a81b3..656bd3e 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -74,7 +74,7 @@</span><br><span> osmo_fsm_inst_state_name(fi), gsm0808_cause_name(cause), ## args); \</span><br><span> assignment_count_result(CTR_ASSIGNMENT_ERROR); \</span><br><span> on_assignment_failure(_conn); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> /* Assume presence of local var 'conn' as struct gsm_subscriber_connection */</span><br><span> #define assignment_count(counter) do { \</span><br><span>@@ -98,7 +98,7 @@</span><br><span> break; \</span><br><span> } \</span><br><span> } \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> #define assignment_count_result(counter) do { \</span><br><span> if (!conn->assignment.result_rate_ctr_done) { \</span><br><span>@@ -109,7 +109,7 @@</span><br><span> "result rate counter already recorded, NOT counting as: %s %s\n", \</span><br><span> bsc_ctr_description[BSC_##counter].name, \</span><br><span> bsc_ctr_description[BSC_##counter].description); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> void assignment_reset(struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c</span><br><span>index d08173c..e384feb 100644</span><br><span>--- a/src/osmo-bsc/handover_decision_2.c</span><br><span>+++ b/src/osmo-bsc/handover_decision_2.c</span><br><span>@@ -86,7 +86,7 @@</span><br><span> LOGPHOLCHANTOBTS((candidate)->current.lchan, (candidate)->target.bts, level, fmt, ## args); \</span><br><span> else if ((candidate)->target.cell_ids.id_list_len) \</span><br><span> LOGPHOLCHANTOREMOTE((candidate)->current.lchan, &(candidate)->target.cell_ids, level, fmt, ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> </span><br><span> #define REQUIREMENT_A_TCHF 0x01</span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 255478f..82a0588 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -90,7 +90,7 @@</span><br><span> bsc_ctr_description[counter].name, \</span><br><span> bsc_ctr_description[counter].description); \</span><br><span> rate_ctr_inc(rate_ctr_group_get_ctr(conn->network->bsc_ctrs, counter)); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> /* Assume presence of local var 'conn' as struct gsm_subscriber_connection.</span><br><span> * Handles bts == NULL gracefully</span><br><span>@@ -106,12 +106,12 @@</span><br><span> rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, counter)); \</span><br><span> else \</span><br><span> rate_ctr_inc(rate_ctr_group_get_ctr(conn->network->bts_unknown_ctrs, counter)); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> #define ho_count(bts, counter) do { \</span><br><span> ho_count_bsc(BSC_##counter); \</span><br><span> ho_count_bts(bts, BTS_##counter); \</span><br><span style="color: hsl(0, 100%, 40%);">-} while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+} while (0)</span><br><span> </span><br><span> static uint8_t g_next_ho_ref = 1;</span><br><span> </span><br><span>@@ -212,12 +212,12 @@</span><br><span> LOG_HO(conn, LOGL_ERROR, "Handover failed in state %s, %s: " fmt "\n", \</span><br><span> osmo_fsm_inst_state_name(conn->fi), handover_result_name(result), ## args); \</span><br><span> handover_end(conn, result); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> #define ho_success() do { \</span><br><span> LOG_HO(conn, LOGL_DEBUG, "Handover succeeded\n"); \</span><br><span> handover_end(conn, HO_RESULT_OK); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> /* issue handover to a cell identified by ARFCN and BSIC */</span><br><span> int handover_request(struct handover_out_req *req)</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 52aadce..d61d032 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -302,7 +302,7 @@</span><br><span> else \</span><br><span> LOG_LCHAN(_lchan, LOGL_DEBUG, "After failure handling, already in state %s\n", \</span><br><span> osmo_fsm_state_name(fsm, state_chg)); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> /* Which state to transition to when lchan_fail() is called in a given state. */</span><br><span> uint32_t lchan_fsm_on_error[34] = {</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 7bd8209..62cd100 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -66,7 +66,7 @@</span><br><span> LCHAN_SET_LAST_ERROR(_lchan, "lchan-rtp failure in state %s: " fmt, \</span><br><span> osmo_fsm_state_name(fi->fsm, state_was), ## args); \</span><br><span> osmo_fsm_inst_dispatch(_lchan->fi, LCHAN_EV_RTP_ERROR, 0); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> /* Called from lchan_fsm_init(), does not need to be visible in lchan_rtp_fsm.h */</span><br><span> void lchan_rtp_fsm_init()</span><br><span>diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c</span><br><span>index 7153ce6..d2ea72d 100644</span><br><span>--- a/src/osmo-bsc/lcs_loc_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_loc_req.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> .cause_val = cause, \</span><br><span> }; \</span><br><span> lcs_loc_req_fsm_state_chg(lcs_loc_req->fi, LCS_LOC_REQ_ST_FAILED); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> static struct lcs_loc_req *lcs_loc_req_alloc(struct osmo_fsm_inst *parent_fi, uint32_t parent_event_term)</span><br><span> {</span><br><span>@@ -110,7 +110,7 @@</span><br><span> #define PARSE_ERR(ERRMSG) do { \</span><br><span> lcs_loc_req_fail(LCS_CAUSE_PROTOCOL_ERROR, "rx BSSMAP Perform Location Request: " ERRMSG); \</span><br><span> return false; \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> payload_length = msg->tail - msg->l4h;</span><br><span> if (tlv_parse2(tp_arr, 1, gsm0808_att_tlvdef(), msg->l4h + 1, payload_length - 1, 0, 0) <= 0)</span><br><span>diff --git a/src/osmo-bsc/lcs_ta_req.c b/src/osmo-bsc/lcs_ta_req.c</span><br><span>index bcee6e1..6252d46 100644</span><br><span>--- a/src/osmo-bsc/lcs_ta_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_ta_req.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span> lcs_ta_req ? osmo_fsm_inst_state_name(lcs_ta_req->fi) : "NULL", ## args); \</span><br><span> lcs_ta_req->failure_cause = cause; \</span><br><span> lcs_ta_req_fsm_state_chg(lcs_ta_req->fi, LCS_TA_REQ_ST_FAILED); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span> </span><br><span> static struct osmo_fsm lcs_ta_req_fsm;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26134">change 26134</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/osmo-bsc/+/26134"/><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-Change-Id: Ib422e7d1a7d543dcd8738581839ce55bb8fc29d2 </div>
<div style="display:none"> Gerrit-Change-Number: 26134 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>