[MERGED] osmo-bsc[master]: cosmetic: Fix infinite number of formatting errors in gscon_...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sat Mar 17 18:06:43 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: cosmetic: Fix infinite number of formatting errors in gscon_fsm_states
......................................................................


cosmetic: Fix infinite number of formatting errors in gscon_fsm_states

I'm not sure how this got past our review :/  Guess I need to be extra
careful.

Change-Id: I8724cadda774c96f13f957d6d5e708bebb81e3ba
---
M src/libbsc/bsc_subscr_conn_fsm.c
1 file changed, 64 insertions(+), 64 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c
index 2542ee7..c7ed438 100644
--- a/src/libbsc/bsc_subscr_conn_fsm.c
+++ b/src/libbsc/bsc_subscr_conn_fsm.c
@@ -768,90 +768,90 @@
 
 static const struct osmo_fsm_state gscon_fsm_states[] = {
 	[ST_INIT] = {
-		     .name = OSMO_STRINGIFY(INIT),
-		     .in_event_mask = S(GSCON_EV_A_CONN_REQ) | S(GSCON_EV_A_CONN_IND),
-		     .out_state_mask = S(ST_WAIT_CC),
-		     .action = gscon_fsm_init,
-		     },
+		.name = OSMO_STRINGIFY(INIT),
+		.in_event_mask = S(GSCON_EV_A_CONN_REQ) | S(GSCON_EV_A_CONN_IND),
+		.out_state_mask = S(ST_WAIT_CC),
+		.action = gscon_fsm_init,
+	 },
 	[ST_WAIT_CC] = {
-			.name = OSMO_STRINGIFY(WAIT_CC),
-			.in_event_mask = S(GSCON_EV_A_CONN_CFM),
-			.out_state_mask = S(ST_ACTIVE),
-			.action = gscon_fsm_wait_cc,
-			},
+		.name = OSMO_STRINGIFY(WAIT_CC),
+		.in_event_mask = S(GSCON_EV_A_CONN_CFM),
+		.out_state_mask = S(ST_ACTIVE),
+		.action = gscon_fsm_wait_cc,
+	},
 	[ST_ACTIVE] = {
-		       .name = OSMO_STRINGIFY(ACTIVE),
-		       .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_A_ASSIGNMENT_CMD) | S(GSCON_EV_A_HO_REQ) |
-		       S(GSCON_EV_HO_START),
-		       .out_state_mask = S(ST_CLEARING) | S(ST_WAIT_CRCX_BTS) | S(ST_WAIT_ASS_CMPL) |
-		       S(ST_WAIT_MODE_MODIFY_ACK) | S(ST_WAIT_MO_HO_CMD) | S(ST_WAIT_HO_COMPL),
-		       .action = gscon_fsm_active,
-		       },
+		.name = OSMO_STRINGIFY(ACTIVE),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_A_ASSIGNMENT_CMD) |
+				 S(GSCON_EV_A_HO_REQ) | S(GSCON_EV_HO_START),
+		.out_state_mask = S(ST_CLEARING) | S(ST_WAIT_CRCX_BTS) | S(ST_WAIT_ASS_CMPL) |
+				  S(ST_WAIT_MODE_MODIFY_ACK) | S(ST_WAIT_MO_HO_CMD) | S(ST_WAIT_HO_COMPL),
+		.action = gscon_fsm_active,
+	},
 	[ST_WAIT_CRCX_BTS] = {
-			      .name = OSMO_STRINGIFY(WAIT_CRCX_BTS),
-			      .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_BTS),
-			      .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_ASS_CMPL),
-			      .action = gscon_fsm_wait_crcx_bts,
-			      },
+		.name = OSMO_STRINGIFY(WAIT_CRCX_BTS),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_BTS),
+		.out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_ASS_CMPL),
+		.action = gscon_fsm_wait_crcx_bts,
+	},
 	[ST_WAIT_ASS_CMPL] = {
-			      .name = OSMO_STRINGIFY(WAIT_ASS_CMPL),
-			      .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_ASS_COMPL) | S(GSCON_EV_RR_ASS_FAIL),
-			      .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS),
-			      .action = gscon_fsm_wait_ass_cmpl,
-			      },
+		.name = OSMO_STRINGIFY(WAIT_ASS_CMPL),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_ASS_COMPL) | S(GSCON_EV_RR_ASS_FAIL),
+		.out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS),
+		.action = gscon_fsm_wait_ass_cmpl,
+	},
 	[ST_WAIT_MDCX_BTS] = {
-			      .name = OSMO_STRINGIFY(WAIT_MDCX_BTS),
-			      .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS),
-			      .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CRCX_MSC),
-			      .action = gscon_fsm_wait_mdcx_bts,
-			      },
+		.name = OSMO_STRINGIFY(WAIT_MDCX_BTS),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS),
+		.out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CRCX_MSC),
+		.action = gscon_fsm_wait_mdcx_bts,
+	},
 	[ST_WAIT_CRCX_MSC] = {
-			      .name = OSMO_STRINGIFY(WAIT_CRCX_MSC),
-			      .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_MSC),
-			      .out_state_mask = S(ST_ACTIVE),
-			      .action = gscon_fsm_wait_crcx_msc,
-			      },
+		.name = OSMO_STRINGIFY(WAIT_CRCX_MSC),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_MSC),
+		.out_state_mask = S(ST_ACTIVE),
+		.action = gscon_fsm_wait_crcx_msc,
+	},
 	[ST_WAIT_MODE_MODIFY_ACK] = {
-				     .name = OSMO_STRINGIFY(WAIT_MODE_MODIFY_ACK),
-				     .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_MODE_MODIFY_ACK),
-				     .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING),
-				     .action = gscon_fsm_wait_mode_modify_ack,
-				     },
+		.name = OSMO_STRINGIFY(WAIT_MODE_MODIFY_ACK),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_MODE_MODIFY_ACK),
+		.out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING),
+		.action = gscon_fsm_wait_mode_modify_ack,
+	},
 	[ST_CLEARING] = {
-			 .name = OSMO_STRINGIFY(CLEARING),
-			 .in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL),
-			 .action = gscon_fsm_clearing,
-			 },
+		.name = OSMO_STRINGIFY(CLEARING),
+		.in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL),
+		.action = gscon_fsm_clearing,
+	 },
 
 	/* TODO: external handover, probably it makes sense to break up the
 	 * program flow in handover_logic.c a bit and handle some of the logic
 	 * here? */
 	[ST_WAIT_MT_HO_ACC] = {
-			       .name = OSMO_STRINGIFY(WAIT_MT_HO_ACC),
-			       },
+		.name = OSMO_STRINGIFY(WAIT_MT_HO_ACC),
+	},
 	[ST_WAIT_MT_HO_COMPL] = {
-				 .name = OSMO_STRINGIFY(WAIT_MT_HO_COMPL),
-				 },
+		 .name = OSMO_STRINGIFY(WAIT_MT_HO_COMPL),
+	},
 	[ST_WAIT_MO_HO_CMD] = {
-			       .name = OSMO_STRINGIFY(WAIT_MO_HO_CMD),
-			       },
+		.name = OSMO_STRINGIFY(WAIT_MO_HO_CMD),
+	},
 	[ST_MO_HO_PROCEEDING] = {
-				 .name = OSMO_STRINGIFY(MO_HO_PROCEEDING),
-				 },
+		 .name = OSMO_STRINGIFY(MO_HO_PROCEEDING),
+	},
 
 	/* Internal handover */
 	[ST_WAIT_HO_COMPL] = {
-			      .name = OSMO_STRINGIFY(WAIT_HO_COMPL),
-			      .in_event_mask = S(GSCON_EV_HO_COMPL) | S(GSCON_EV_HO_FAIL) | S(GSCON_EV_HO_TIMEOUT),
-			      .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS_HO),
-			      .action = gscon_fsm_wait_ho_compl,
-			      },
+		.name = OSMO_STRINGIFY(WAIT_HO_COMPL),
+		.in_event_mask = S(GSCON_EV_HO_COMPL) | S(GSCON_EV_HO_FAIL) | S(GSCON_EV_HO_TIMEOUT),
+		.out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS_HO),
+		.action = gscon_fsm_wait_ho_compl,
+	},
 	[ST_WAIT_MDCX_BTS_HO] = {
-				 .name = OSMO_STRINGIFY(WAIT_MDCX_BTS_HO),
-				 .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS),
-				 .action = gscon_fsm_wait_mdcx_bts_ho,
-				 .out_state_mask = S(ST_ACTIVE),
-				 },
+		.name = OSMO_STRINGIFY(WAIT_MDCX_BTS_HO),
+		.in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS),
+		.action = gscon_fsm_wait_mdcx_bts_ho,
+		.out_state_mask = S(ST_ACTIVE),
+	},
 };
 
 static void gscon_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)

-- 
To view, visit https://gerrit.osmocom.org/7347
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8724cadda774c96f13f957d6d5e708bebb81e3ba
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list