pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28798 )

Change subject: Rename functions generating CBSP/SBc-AP Write-Replace request ......................................................................

Rename functions generating CBSP/SBc-AP Write-Replace request

Previous naming is misleading, as it seems to indicate the function is used to generate any kind of message, which is wrong.

Change-Id: Ib0228c64bbf104accdbbebb6076004a6a1f44c6f --- M include/osmocom/cbc/cbsp_msg.h M include/osmocom/cbc/sbcap_msg.h M src/cbc_message.c M src/cbsp_msg.c M src/sbcap_msg.c 5 files changed, 6 insertions(+), 6 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/98/28798/1

diff --git a/include/osmocom/cbc/cbsp_msg.h b/include/osmocom/cbc/cbsp_msg.h index d64d355..c462af4 100644 --- a/include/osmocom/cbc/cbsp_msg.h +++ b/include/osmocom/cbc/cbsp_msg.h @@ -2,4 +2,4 @@ #include <osmocom/gsm/cbsp.h>

struct cbc_message; -struct osmo_cbsp_decoded *cbcmsg_to_cbsp(void *ctx, const struct cbc_message *cbcmsg); +struct osmo_cbsp_decoded *cbsp_gen_write_replace_req(void *ctx, const struct cbc_message *cbcmsg); diff --git a/include/osmocom/cbc/sbcap_msg.h b/include/osmocom/cbc/sbcap_msg.h index 784938d..1f2c350 100644 --- a/include/osmocom/cbc/sbcap_msg.h +++ b/include/osmocom/cbc/sbcap_msg.h @@ -7,5 +7,5 @@ struct cbc_message; typedef struct SBcAP_SBC_AP_PDU SBcAP_SBC_AP_PDU_t;

-SBcAP_SBC_AP_PDU_t *cbcmsg_to_sbcap(void *ctx, const struct cbc_message *cbcmsg); +SBcAP_SBC_AP_PDU_t *sbcap_gen_write_replace_warning_req(void *ctx,const struct cbc_message *cbcmsg); SBcAP_SBC_AP_PDU_t *sbcap_gen_stop_warning_req(void *ctx, const struct cbc_message *cbcmsg); diff --git a/src/cbc_message.c b/src/cbc_message.c index 8884b6c..029abcb 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -65,7 +65,7 @@ peer->name); return -ENOTCONN; } - if (!(cbsp = cbcmsg_to_cbsp(peer, cbcmsg))) { + if (!(cbsp = cbsp_gen_write_replace_req(peer, cbcmsg))) { LOGP(DCBSP, LOGL_ERROR, "[%s] Tx CBSP: msg gen failed\n", peer->name); return -EINVAL; @@ -79,7 +79,7 @@ peer->name); return -ENOTCONN; } - if (!(sbcap = cbcmsg_to_sbcap(peer, cbcmsg))) { + if (!(sbcap = sbcap_gen_write_replace_warning_req(peer, cbcmsg))) { LOGP(DSBcAP, LOGL_ERROR, "[%s] Tx SBc-AP: msg gen failed\n", peer->name); return -EINVAL; diff --git a/src/cbsp_msg.c b/src/cbsp_msg.c index 4d0f8d3..de8d852 100644 --- a/src/cbsp_msg.c +++ b/src/cbsp_msg.c @@ -50,7 +50,7 @@ }

/* generate a CBSP WRITE-REPLACE from our internal representation */ -struct osmo_cbsp_decoded *cbcmsg_to_cbsp(void *ctx, const struct cbc_message *cbcmsg) +struct osmo_cbsp_decoded *cbsp_gen_write_replace_req(void *ctx, const struct cbc_message *cbcmsg) { struct osmo_cbsp_write_replace *wrepl; const struct smscb_message *smscb = &cbcmsg->msg; diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 511036f..735cf8b 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -84,7 +84,7 @@ /* generate a SBc-AP WRITE-REPLACE WARNING REQUEST from our internal representation. * 3GPP TS 36.413 9.1.13.1 */ -SBcAP_SBC_AP_PDU_t *cbcmsg_to_sbcap(void *ctx, const struct cbc_message *cbcmsg) +SBcAP_SBC_AP_PDU_t *sbcap_gen_write_replace_warning_req(void *ctx,const struct cbc_message *cbcmsg) { const struct smscb_message *smscb = &cbcmsg->msg; SBcAP_SBC_AP_PDU_t *pdu;