[MERGED] osmo-bsc[master]: osmo-bsc RESET FSM: use distinct struct names

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: osmo-bsc RESET FSM: use distinct struct names
......................................................................


osmo-bsc RESET FSM: use distinct struct names

Use distinctive struct names: s/fsm_/fsm_bsc_reset/. They only exist
in the static context and it works fine, but the mad fsm-to-dot.py script
breaks with identical struct names. Can't hurt to have unique names.

Change-Id: I986377a74ccd83ca3b52e7f058bbc9115f05f741
---
M src/osmo-bsc/osmo_bsc_reset.c
1 file changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/src/osmo-bsc/osmo_bsc_reset.c b/src/osmo-bsc/osmo_bsc_reset.c
index aadbd86..e482a44 100644
--- a/src/osmo-bsc/osmo_bsc_reset.c
+++ b/src/osmo-bsc/osmo_bsc_reset.c
@@ -33,24 +33,24 @@
 #define RESET_RESEND_TIMER_NO 1234	/* FIXME: dig out the real timer number */
 #define BAD_CONNECTION_THRESOLD 3	/* connection failures */
 
-enum fsm_states {
+enum fsm_bsc_reset_states {
 	ST_DISC,		/* Disconnected from MSC */
 	ST_CONN,		/* We have a confirmed connection to the MSC */
 };
 
-static const struct value_string fsm_state_names[] = {
+static const struct value_string fsm_bsc_reset_state_names[] = {
 	{ST_DISC, "ST_DISC (disconnected)"},
 	{ST_CONN, "ST_CONN (connected)"},
 	{0, NULL},
 };
 
-enum fsm_evt {
+enum fsm_bsc_reset_evt {
 	EV_RESET_ACK,		/* got reset acknowlegement from the MSC */
 	EV_N_DISCONNECT,	/* lost a connection */
 	EV_N_CONNECT,		/* made a successful connection */
 };
 
-static const struct value_string fsm_evt_names[] = {
+static const struct value_string fsm_bsc_reset_evt_names[] = {
 	{EV_RESET_ACK, "EV_RESET_ACK"},
 	{EV_N_DISCONNECT, "EV_N_DISCONNECT"},
 	{EV_N_CONNECT, "EV_N_CONNECT"},
@@ -63,7 +63,7 @@
 	struct bsc_msc_data *msc = (struct bsc_msc_data *)data;
 
 	LOGP(DMSC, LOGL_NOTICE, "fsm-state (msc-reset): %s, fsm-event: %s, MSC No.: %i\n",
-	     get_value_string(fsm_state_names, ST_DISC), get_value_string(fsm_evt_names, event), msc->nr);
+	     get_value_string(fsm_bsc_reset_state_names, ST_DISC), get_value_string(fsm_bsc_reset_evt_names, event), msc->nr);
 	msc->msc_con->msc_conn_loss_count = 0;
 	osmo_fsm_inst_state_chg(fi, ST_CONN, 0, 0);
 }
@@ -74,7 +74,7 @@
 	struct bsc_msc_data *msc = (struct bsc_msc_data *)data;
 
 	LOGP(DMSC, LOGL_NOTICE, "fsm-state (msc-reset): %s, fsm-event: %s, MSC No.: %i\n",
-	     get_value_string(fsm_state_names, ST_CONN), get_value_string(fsm_evt_names, event), msc->nr);
+	     get_value_string(fsm_bsc_reset_state_names, ST_CONN), get_value_string(fsm_bsc_reset_evt_names, event), msc->nr);
 
 	OSMO_ASSERT(msc);
 
@@ -98,7 +98,7 @@
 	struct bsc_msc_data *msc = (struct bsc_msc_data *)fi->priv;
 
 	LOGP(DMSC, LOGL_NOTICE, "reset-ack timeout (T%i) in state %s, MSC No.: %i, resending...\n", fi->T,
-	     get_value_string(fsm_state_names, fi->state), msc->nr);
+	     get_value_string(fsm_bsc_reset_state_names, fi->state), msc->nr);
 
 	osmo_bsc_sigtran_reset(msc);
 	osmo_bsc_sigtran_tx_reset(msc);
@@ -107,7 +107,7 @@
 	return 0;
 }
 
-static struct osmo_fsm_state fsm_states[] = {
+static struct osmo_fsm_state fsm_bsc_reset_states[] = {
 	[ST_DISC] = {
 		     .in_event_mask = (1 << EV_RESET_ACK),
 		     .out_state_mask = (1 << ST_DISC) | (1 << ST_CONN),
@@ -125,8 +125,8 @@
 /* State machine definition */
 static struct osmo_fsm fsm = {
 	.name = "A-CONNECTION",
-	.states = fsm_states,
-	.num_states = ARRAY_SIZE(fsm_states),
+	.states = fsm_bsc_reset_states,
+	.num_states = ARRAY_SIZE(fsm_bsc_reset_states),
 	.log_subsys = DMSC,
 	.timer_cb = fsm_reset_ack_timeout_cb,
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I986377a74ccd83ca3b52e7f058bbc9115f05f741
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>