From 76739a7109c15ac17f6804c56f2ff4c890dc7a14 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Thu, 24 May 2018 19:12:03 +0200
Subject: cosmetic: gscon: drop odd use of OSMO_STRINGIFY

Do not invoke OSMO_STRINGIFY() with arbitrary names, just quote instead.

The idea was that OSMO_STRINGIFY() avoids typos by ensuring well-defined names
are stringified, but this highlights that OSMO_STRINGIFY() is in fact usable
with completely arbitrary arguments and actually lacks the validation part :/

Change-Id: I458cd2cd0d6ddb0e6db3bb8d546a20336ae8c5f1
---
 src/osmo-bsc/bsc_subscr_conn_fsm.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 2ae4b33a3..d2d20955a 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -820,19 +820,19 @@ static void gscon_fsm_wait_mdcx_bts_ho(struct osmo_fsm_inst *fi, uint32_t event,
 
 static const struct osmo_fsm_state gscon_fsm_states[] = {
 	[ST_INIT] = {
-		.name = OSMO_STRINGIFY(INIT),
+		.name = "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),
+		.name = "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),
+		.name = "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) |
@@ -840,31 +840,31 @@ static const struct osmo_fsm_state gscon_fsm_states[] = {
 		.action = gscon_fsm_active,
 	},
 	[ST_WAIT_CRCX_BTS] = {
-		.name = OSMO_STRINGIFY(WAIT_CRCX_BTS),
+		.name = "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),
+		.name = "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),
+		.name = "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),
+		.name = "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_CLEARING] = {
-		.name = OSMO_STRINGIFY(CLEARING),
+		.name = "CLEARING",
 		.in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL),
 		.action = gscon_fsm_clearing,
 	 },
@@ -873,27 +873,27 @@ static const struct osmo_fsm_state gscon_fsm_states[] = {
 	 * 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 = "WAIT_MT_HO_ACC",
 	},
 	[ST_WAIT_MT_HO_COMPL] = {
-		 .name = OSMO_STRINGIFY(WAIT_MT_HO_COMPL),
+		 .name = "WAIT_MT_HO_COMPL",
 	},
 	[ST_WAIT_MO_HO_CMD] = {
-		.name = OSMO_STRINGIFY(WAIT_MO_HO_CMD),
+		.name = "WAIT_MO_HO_CMD",
 	},
 	[ST_MO_HO_PROCEEDING] = {
-		 .name = OSMO_STRINGIFY(MO_HO_PROCEEDING),
+		 .name = "MO_HO_PROCEEDING",
 	},
 
 	/* Internal handover */
 	[ST_WAIT_HO_COMPL] = {
-		.name = OSMO_STRINGIFY(WAIT_HO_COMPL),
+		.name = "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) | S(ST_CLEARING),
 		.action = gscon_fsm_wait_ho_compl,
 	},
 	[ST_WAIT_MDCX_BTS_HO] = {
-		.name = OSMO_STRINGIFY(WAIT_MDCX_BTS_HO),
+		.name = "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),
-- 
cgit v1.2.3