fix various missing vars and unused vars

Change-Id: I16cf82fe3b27a4cdd69df1cf34e60918b453d07b

3 files changed, 2 insertions, 21 deletions

diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 376bc1170..8eaa4508e 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -755,7 +755,6 @@ static int gsm48_rx_mm_serv_req(struct gsm_subscriber_connection *conn, struct m
 	uint8_t mi_type;
 	char mi_string[GSM48_MI_SIZE];
 
-	struct gsm_network *network = conn->network;
 	struct gsm48_hdr *gh = msgb_l3(msg);
 	struct gsm48_service_request *req =
 			(struct gsm48_service_request *)gh->data;
@@ -765,6 +764,7 @@ static int gsm48_rx_mm_serv_req(struct gsm_subscriber_connection *conn, struct m
 	uint8_t mi_len = *(classmark2 + classmark2_len);
 	uint8_t *mi = (classmark2 + classmark2_len + 1);
 	struct osmo_location_area_id lai;
+	struct osmo_fsm_inst *proc_arq_fsm;
 
 	lai.plmn.mcc = bts->network->country_code;
 	lai.plmn.mnc = bts->network->network_code;
@@ -978,6 +978,7 @@ static int gsm48_rx_rr_pag_resp(struct gsm_subscriber_connection *conn, struct m
 	char mi_string[GSM48_MI_SIZE];
 	int rc = 0;
 	struct osmo_location_area_id lai;
+	struct osmo_fsm_inst *proc_arq_fsm;
 
 	lai.plmn.mcc = bts->network->country_code;
 	lai.plmn.mnc = bts->network->network_code;
diff --git a/openbsc/src/libvlr/vlr_access_req_fsm.c b/openbsc/src/libvlr/vlr_access_req_fsm.c
index 1cb4bb273..61c569426 100644
--- a/openbsc/src/libvlr/vlr_access_req_fsm.c
+++ b/openbsc/src/libvlr/vlr_access_req_fsm.c
@@ -100,7 +100,6 @@ static void _proc_arq_vlr_post_imei(struct osmo_fsm_inst *fi)
 {
 	struct proc_arq_priv *par = fi->priv;
 	struct vlr_subscriber *vsub = par->vsub;
-	struct vlr_instance *vlr = vsub->vlr;
 
 	/* TODO: Identity := IMSI */
 	/* FIXME: send process acess response already now?!? */
@@ -148,10 +147,6 @@ static void _proc_arq_vlr_post_trace(struct osmo_fsm_inst *fi)
 /* After Subscriber_Present_VLR */
 static void _proc_arq_vlr_post_pres(struct osmo_fsm_inst *fi)
 {
-	struct proc_arq_priv *par = fi->priv;
-	struct vlr_subscriber *vsub = par->vsub;
-	struct vlr_instance *vlr = vsub->vlr;
-
 	if (0 /* TODO: tracing required */) {
 		/* TODO: Trace_Subscriber_Activity_VLR */
 		osmo_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_TRACE_SUB, 0, 0);
@@ -164,7 +159,6 @@ static void _proc_arq_vlr_node2_post_vlr(struct osmo_fsm_inst *fi)
 {
 	struct proc_arq_priv *par = fi->priv;
 	struct vlr_subscriber *vsub = par->vsub;
-	struct vlr_instance *vlr = vsub->vlr;
 
 	if (!vsub->sub_dataconf_by_hlr_ind) {
 		/* Set User Error: Unidentified Subscriber */
@@ -191,7 +185,6 @@ static void _proc_arq_vlr_node2(struct osmo_fsm_inst *fi)
 {
 	struct proc_arq_priv *par = fi->priv;
 	struct vlr_subscriber *vsub = par->vsub;
-	struct vlr_instance *vlr = vsub->vlr;
 
 	vsub->conf_by_radio_contact_ind = true;
 	if (vsub->loc_conf_in_hlr_ind == false) {
@@ -211,7 +204,6 @@ static void proc_arq_vlr_fn_post_imsi(struct osmo_fsm_inst *fi)
 {
 	struct proc_arq_priv *par = fi->priv;
 	struct vlr_subscriber *vsub = par->vsub;
-	struct vlr_instance *vlr = vsub->vlr;
 
 	OSMO_ASSERT(vsub);
 
@@ -296,9 +288,6 @@ static void proc_arq_vlr_fn_w_auth(struct osmo_fsm_inst *fi,
 				   uint32_t event, void *data)
 {
 	enum vlr_auth_fsm_result *res = data;
-	struct proc_arq_priv *par = fi->priv;
-	struct vlr_subscriber *vsub = par->vsub;
-	struct vlr_instance *vlr = vsub->vlr;
 	enum vlr_proc_arq_result ret = VLR_PR_ARQ_RES_UNKNOWN_ERROR;
 
 	OSMO_ASSERT(event == PR_ARQ_E_AUTH_RES);
diff --git a/openbsc/src/libvlr/vlr_lu_fsm.c b/openbsc/src/libvlr/vlr_lu_fsm.c
index 110851e7e..2f8b043be 100644
--- a/openbsc/src/libvlr/vlr_lu_fsm.c
+++ b/openbsc/src/libvlr/vlr_lu_fsm.c
@@ -1043,15 +1043,6 @@ vlr_loc_update(struct osmo_fsm_inst *parent, uint32_t parent_term,
 {
 	struct osmo_fsm_inst *fi;
 	struct lu_fsm_priv *lfp;
-	char buf[16];
-	const char *id_str;
-
-	if (imsi)
-		id_str = imsi;
-	else {
-		snprintf(buf, sizeof(buf), "%08x", tmsi);
-		id_str = buf;
-	}
 
 	fi = osmo_fsm_inst_alloc_child(&vlr_lu_fsm, parent, parent_term);
 	if (!fi)