[S] Change in osmo-iuh[master]: iu_client: fix linter issues
lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/40848?usp=email ) Change subject: iu_client: fix linter issues ...................................................................... iu_client: fix linter issues Before removing the iu_client. Fix linter issues to make jenkins more happy. Related: OS#5487 Change-Id: Ia8b3405701ed62eac39b9510d34da4ba1987146c --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 13 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h index b0ff448..7b5c1b4 100644 --- a/include/osmocom/ranap/iu_client.h +++ b/include/osmocom/ranap/iu_client.h @@ -61,14 +61,14 @@ } /* Implementations of iu_recv_cb_t shall find the ranap_ue_conn_ctx in msg->dst. */ -typedef int (* ranap_iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, - uint16_t *sai); +typedef int (*ranap_iu_recv_cb_t)(struct msgb *msg, struct gprs_ra_id *ra_id, + uint16_t *sai); -typedef int (* ranap_iu_event_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, - enum ranap_iu_event_type type, void *data); +typedef int (*ranap_iu_event_cb_t)(struct ranap_ue_conn_ctx *ue_ctx, + enum ranap_iu_event_type type, void *data); -typedef int (* ranap_iu_rab_ass_resp_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, uint8_t rab_id, - struct RANAP_RAB_SetupOrModifiedItemIEs_s *setup_ies); +typedef int (*ranap_iu_rab_ass_resp_cb_t)(struct ranap_ue_conn_ctx *ue_ctx, uint8_t rab_id, + struct RANAP_RAB_SetupOrModifiedItemIEs_s *setup_ies); int ranap_iu_init(void *ctx, int log_subsystem, const char *sccp_user_name, struct osmo_sccp_instance *sccp, ranap_iu_recv_cb_t iu_recv_cb, ranap_iu_event_cb_t iu_event_cb); diff --git a/src/iu_client.c b/src/iu_client.c index d2b00e9..5de1826 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -387,7 +387,7 @@ struct msgb *msg; /* create RANAP message */ - msg = ranap_new_msg_sec_mod_cmd(vec->ik, send_ck? vec->ck : NULL, + msg = ranap_new_msg_sec_mod_cmd(vec->ik, send_ck ? vec->ck : NULL, new_key ? RANAP_KeyStatus_new : RANAP_KeyStatus_old); msg->l2h = msg->data; /* wrap RANAP message in SCCP N-DATA.req */ @@ -431,7 +431,7 @@ } #if 0 - -- not used at present -- +/* not used at present */ static int iu_grnc_id_compose(struct iu_grnc_id *src, struct RANAP_GlobalRNC_ID *dst) { /* The caller must ensure proper size */ @@ -515,9 +515,9 @@ return -1; } ra_id = &_ra_id; - if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_RAC_PRESENT) { + if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_RAC_PRESENT) _ra_id.rac = asn1str_to_u8(&ies->rac); - } + if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_SAI_PRESENT) { _sai = asn1str_to_u16(&ies->sai.sAC); sai = &_sai; @@ -656,9 +656,9 @@ " procedureCode 'InitialUE_Message', instead got %u and %u\n", message->direction, message->procedureCode); rc = -1; - } - else + } else { rc = ranap_handle_co_initial_ue(ctx, &message->msg.initialUE_MessageIEs); + } if (rc) { LOGPIU(LOGL_ERROR, "Error in %s (%d)\n", __func__, rc); @@ -862,7 +862,7 @@ if (rnc) LOGPIUC(log_level, " at SCCP-addr %s", osmo_sccp_addr_dump(&rnc->sccp_addr)); if (tmsi_or_ptmsi) - LOGPIUC(log_level, ", for %s %08x\n", is_ps? "PTMSI" : "TMSI", *tmsi_or_ptmsi); + LOGPIUC(log_level, ", for %s %08x\n", is_ps ? "PTMSI" : "TMSI", *tmsi_or_ptmsi); else LOGPIUC(log_level, ", for IMSI %s\n", imsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/40848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia8b3405701ed62eac39b9510d34da4ba1987146c Gerrit-Change-Number: 40848 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: pespin <pespin@sysmocom.de>
participants (1)
-
lynxis lazus