lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/43482?usp=email )
Change subject: libvlr: fix linter issues ......................................................................
libvlr: fix linter issues
Make the linter happy by fixing all issues:
- add spaces when policy require it - remove unnecessary return;'s - remove else in `if () {return;} else { foo; }`
Change-Id: I99f424b196e3b583716d05e77dcd03b907920af1 --- M include/osmocom/vlr/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c 6 files changed, 48 insertions(+), 51 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/43482/1
diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index 28c23a3..9a64a5a 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -119,7 +119,7 @@ struct vlr_instance *vlr;
/* TODO either populate from HLR or drop this completely? */ - long long unsigned int id; + unsigned long long id;
/* Data from HLR */ /* 3GPP TS 23.008 */ /* Always use vlr_subscr_set_imsi() to write to imsi[] */ diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index eb1f209..3521519 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -237,15 +237,15 @@ present = true; } if (vsub->msisdn[0]) { - OSMO_STRBUF_PRINTF(sb, "%sMSISDN-%s", present? ":" : "", vsub->msisdn); + OSMO_STRBUF_PRINTF(sb, "%sMSISDN-%s", present ? ":" : "", vsub->msisdn); present = true; } if (vsub->tmsi != GSM_RESERVED_TMSI) { - OSMO_STRBUF_PRINTF(sb, "%sTMSI-0x%08X", present? ":" : "", vsub->tmsi); + OSMO_STRBUF_PRINTF(sb, "%sTMSI-0x%08X", present ? ":" : "", vsub->tmsi); present = true; } if (vsub->tmsi_new != GSM_RESERVED_TMSI) { - OSMO_STRBUF_PRINTF(sb, "%sTMSInew-0x%08X", present? ":" : "", vsub->tmsi_new); + OSMO_STRBUF_PRINTF(sb, "%sTMSInew-0x%08X", present ? ":" : "", vsub->tmsi_new); present = true; } if (!present) @@ -257,7 +257,7 @@ const char *vlr_subscr_short_name(const struct vlr_subscr *vsub, unsigned int maxlen) { /* cast away the const so we can shorten the string within the static buffer */ - char *name = (char*)vlr_subscr_name(vsub); + char *name = (char *) vlr_subscr_name(vsub); size_t len = strlen(name); if (maxlen < 2) return "-"; @@ -379,7 +379,7 @@ level = LOGL_DEBUG;
LOGPSRC(g_vlr_log_cat[OSMO_VLR_LOGC_VLR], level, file, line, "VLR subscr %s %s %s: now used by %s\n", - vlr_subscr_name(vsub), (e->count - old_use_count) > 0? "+" : "-", e->use, + vlr_subscr_name(vsub), (e->count - old_use_count) > 0 ? "+" : "-", e->use, osmo_use_count_name_buf(buf, sizeof(buf), e->use_count));
if (e->count < 0) @@ -712,8 +712,8 @@ } LOGVLR(LOGL_DEBUG, "set Last E-UTRAN PLMN ID on subscriber: %s\n", vsub->sgs.last_eutran_plmn_present ? - osmo_plmn_name(&vsub->sgs.last_eutran_plmn) : - "(none)"); + osmo_plmn_name(&vsub->sgs.last_eutran_plmn) : + "(none)"); }
bool vlr_subscr_matches_imsi(struct vlr_subscr *vsub, const char *imsi) @@ -817,7 +817,7 @@ struct sgsn_subscriber_pdp_data * vlr_subscr_pdp_data_alloc(struct vlr_subscr *vsub) { - struct sgsn_subscriber_pdp_data* pdata; + struct sgsn_subscriber_pdp_data *pdata;
pdata = talloc_zero(vsub, struct sgsn_subscriber_pdp_data);
@@ -1454,7 +1454,7 @@ switch (mi->type) { case GSM_MI_TYPE_IMSI: return osmo_fsm_inst_dispatch(vsub->auth_fsm, - VLR_AUTH_E_MS_ID_IMSI, (void*)mi->imsi); + VLR_AUTH_E_MS_ID_IMSI, (void *) mi->imsi); break; } } @@ -1462,11 +1462,11 @@ if (vsub->lu_fsm) { switch (mi->type) { case GSM_MI_TYPE_IMSI: - return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMSI, (void*)mi->imsi); + return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMSI, (void *) mi->imsi); case GSM_MI_TYPE_IMEI: - return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEI, (void*)mi->imei); + return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEI, (void *) mi->imei); case GSM_MI_TYPE_IMEISV: - return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEISV, (void*)mi->imeisv); + return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEISV, (void *) mi->imeisv); default: return -EINVAL; } diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 6d4a084..53caae5 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -108,7 +108,7 @@ static const char *vlr_proc_arq_result_name(const struct osmo_fsm_inst *fi) { struct proc_arq_priv *par = fi->priv; - return par->result? gsm48_reject_value_name(par->result) : "PASSED"; + return par->result ? gsm48_reject_value_name(par->result) : "PASSED"; }
#define proc_arq_fsm_done(fi, res) _proc_arq_fsm_done(fi, res, __FILE__, __LINE__) @@ -412,18 +412,17 @@ * Set User Error: Unidentified Subscriber */ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; - } else { - /* TMSI was included, are we permitted to use it? */ - if (vlr->cfg.parq_retrieve_imsi) { - /* Obtain_IMSI_VLR */ - osmo_tdef_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_OBTAIN_IMSI, parq_fsm_state_tdef, vlr_tdefs, -1); - return; - } else { - /* Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); - return; - } } + + /* TMSI was included, are we permitted to use it? */ + if (vlr->cfg.parq_retrieve_imsi) { + /* Obtain_IMSI_VLR */ + osmo_tdef_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_OBTAIN_IMSI, parq_fsm_state_tdef, vlr_tdefs, -1); + return; + } + + /* Set User Error: Unidentified Subscriber */ + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); }
/* ID REQ(IMSI) has returned */ @@ -493,7 +492,7 @@ if (!data) LOGPFSML(fi, LOGL_ERROR, "invalid ciphering result: NULL\n"); else - result = *(enum vlr_ciph_result_cause*)data; + result = *((enum vlr_ciph_result_cause *) data);
switch (result) { case VLR_CIPH_COMPL: @@ -788,14 +787,14 @@
static const struct osmo_fsm_state upd_loc_child_vlr_states[] = { [ULC_S_IDLE] = { - .in_event_mask = , + .in_event_mask = TODO, .out_state_mask = S(ULC_S_WAIT_HLR_RESP) | S(ULC_S_DONE), .name = "IDLE", .action = upd_loc_child_f_idle, }, [ULC_S_WAIT_HLR_RESP] = { - .in_event_mask = , + .in_event_mask = TODO, .out_state_mask = S(ULC_S_DONE), .name = "WAIT-HLR-RESP", .action = upd_loc_child_f_w_hlr, diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index b3bd236..76858aa 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -196,7 +196,7 @@ " (MS is %sR99 capable, vec has %sUMTS AKA tokens, res_len=%u is %s)\n", is_r99 ? "" : "NOT ", (vec->auth_types & OSMO_AUTH_TYPE_UMTS) ? "" : "NO ", - res_len, (res_len == vec->res_len)? "valid" : "INVALID on UTRAN"); + res_len, (res_len == vec->res_len) ? "valid" : "INVALID on UTRAN"); goto out_false; }
@@ -213,21 +213,21 @@ " context\n"); vsub->sec_ctx = VLR_SEC_CTX_UMTS; return true; - } else { - if (res_len != sizeof(vec->sres) - || memcmp(res, vec->sres, sizeof(vec->sres))) { - LOGVSUBP(LOGL_INFO, vsub, "GSM AUTH failure:" - " mismatching sres (expected sres=%s)\n", - osmo_hexdump(vec->sres, sizeof(vec->sres))); - goto out_false; - } - - LOGVSUBP(LOGL_INFO, vsub, "AUTH established GSM security" - " context\n"); - vsub->sec_ctx = VLR_SEC_CTX_GSM; - return true; }
+ if (res_len != sizeof(vec->sres) + || memcmp(res, vec->sres, sizeof(vec->sres))) { + LOGVSUBP(LOGL_INFO, vsub, "GSM AUTH failure:" + " mismatching sres (expected sres=%s)\n", + osmo_hexdump(vec->sres, sizeof(vec->sres))); + goto out_false; + } + + LOGVSUBP(LOGL_INFO, vsub, "AUTH established GSM security" + " context\n"); + vsub->sec_ctx = VLR_SEC_CTX_GSM; + return true; + out_false: vsub->sec_ctx = VLR_SEC_CTX_NONE; return false; diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 4bed335..e63f1ee 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -157,7 +157,7 @@ static inline struct vlr_subscr *upd_hlr_vlr_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &upd_hlr_vlr_fsm); - return (struct vlr_subscr*)fi->priv; + return (struct vlr_subscr *) fi->priv; }
struct osmo_fsm_inst * @@ -269,7 +269,7 @@ static inline struct vlr_subscr *sub_pres_vlr_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &sub_pres_vlr_fsm); - return (struct vlr_subscr*)fi->priv; + return (struct vlr_subscr *) fi->priv; }
/* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true. @@ -668,7 +668,7 @@ static inline struct lu_compl_vlr_priv *lu_compl_vlr_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &lu_compl_vlr_fsm); - return (struct lu_compl_vlr_priv*)fi->priv; + return (struct lu_compl_vlr_priv *) fi->priv; }
struct osmo_fsm_inst * @@ -1271,7 +1271,7 @@ if (!data) LOGPFSML(fi, LOGL_ERROR, "invalid ciphering result: NULL\n"); else - result = *(enum vlr_ciph_result_cause*)data; + result = *((enum vlr_ciph_result_cause *) data);
switch (result) { case VLR_CIPH_COMPL: @@ -1393,7 +1393,7 @@ case VLR_ULA_E_LU_COMPL_FAILURE: cause = GSM48_REJECT_NETWORK_FAILURE; if (data) - cause = *(uint8_t*)data; + cause = *((uint8_t *) data); lu_fsm_discard_lu_compl_fsm(fi); lu_fsm_failure(fi, cause); break; @@ -1425,7 +1425,7 @@ vsub->sub_dataconf_by_hlr_ind = false; cause = GSM48_REJECT_NETWORK_FAILURE; if (data) - cause = *(uint8_t*)data; + cause = *((uint8_t *) data); lu_fsm_discard_lu_compl_fsm(fi); lu_fsm_failure(fi, cause); break; @@ -1635,7 +1635,7 @@ static inline struct lu_fsm_priv *lu_fsm_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &vlr_lu_fsm); - return (struct lu_fsm_priv*)fi->priv; + return (struct lu_fsm_priv *) fi->priv; }
static struct osmo_fsm_inst * diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c index 755db1e..631ae29 100644 --- a/src/libvlr/vlr_sgs.c +++ b/src/libvlr/vlr_sgs.c @@ -319,8 +319,6 @@
/* Balance ref count increment from vlr_sgs_pag() */ vlr_subscr_put(vsub, VSUB_USE_SGS_PAGING_REQ); - - return; }
/*! Notify that a paging message has been sent and a paging is now in progress.