From 6038ad4cf9b3e1a138a15ae30d9e7e98027cac65 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Tue, 13 Nov 2018 13:55:09 +0100 Subject: [PATCH] vlr: drop unused is_ps parameter in vlr_subscr_req_lu() the function vlr_subscr_req_lu() has a parameter is_ps, which is set to vsub->vlr->cfg.is_ps by the only caller in vlr_lu_fsm.c. Inside the function one can see that vsub->vlr->cfg.is_ps is used directly to decide between PS or CS LU, we could also use is_ps there. Presumably the parameter is_ps had been abandonned in an early development stage and was not removed, so lets drop the parameter. Change-Id: Id239721773b90099d122b232dae1ba457be9d255 --- src/libvlr/vlr.c | 2 +- src/libvlr/vlr_core.h | 2 +- src/libvlr/vlr_lu_fsm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f7572f2f7..f7ac864d3 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -616,7 +616,7 @@ static int vlr_rx_gsup_purge_no_subscr(struct vlr_instance *vlr, } /* VLR internal call to request UpdateLocation from HLR */ -int vlr_subscr_req_lu(struct vlr_subscr *vsub, bool is_ps) +int vlr_subscr_req_lu(struct vlr_subscr *vsub) { struct osmo_gsup_message gsup_msg = {0}; int rc; diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index a6585be28..d336b1b75 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -5,7 +5,7 @@ struct osmo_gsup_message; const char *vlr_subscr_name(struct vlr_subscr *vsub); -int vlr_subscr_req_lu(struct vlr_subscr *vsub, bool is_ps) __attribute__((warn_unused_result)); +int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); struct vlr_subscr *vlr_subscr_alloc(struct vlr_instance *vlr); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 717db42bc..02e49e065 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -79,7 +79,7 @@ static void upd_hlr_vlr_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, OSMO_ASSERT(event == UPD_HLR_VLR_E_START); /* Send UpdateLocation to HLR */ - rc = vlr_subscr_req_lu(vsub, vsub->vlr->cfg.is_ps); + rc = vlr_subscr_req_lu(vsub); if (rc < 0) LOGPFSML(fi, LOGL_ERROR, "Failed to send UpdateLocation to HLR\n"); osmo_fsm_inst_state_chg(fi, UPD_HLR_VLR_S_WAIT_FOR_DATA,