cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

VLR: vlr_subscr_{,msisdn_or_}name: const vsub arg 

Make the vsub argument of both vlr_subscr_msisdn_or_name()
and vlr_subscr_name() a const.

The LOGVSUBP() macro uses vlr_subscr_name() and will not generate a
warning anymore when used with a const vsub.

Change-Id: If609269191f4df6186d823a2eee14012846328e2
This commit is contained in:
Oliver Smith 2019-01-08 11:47:21 +01:00 committed by osmith
parent 361fa46444
commit 5598aaef23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocom/msc/vlr.h
View File

@ -330,8 +330,8 @@ lu_compl_vlr_proc_start(struct osmo_fsm_inst *parent,
uint32_t parent_event_failure);
const char *vlr_subscr_name(struct vlr_subscr *vsub);
const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub);
const char *vlr_subscr_name(const struct vlr_subscr *vsub);
const char *vlr_subscr_msisdn_or_name(const struct vlr_subscr *vsub);
#define vlr_subscr_find_by_imsi(vlr, imsi) \
_vlr_subscr_find_by_imsi(vlr, imsi, __FILE__, __LINE__)

4
src/libvlr/vlr.c
View File

@ -79,7 +79,7 @@ uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer)
}
/* return static buffer with printable name of VLR subscriber */
const char *vlr_subscr_name(struct vlr_subscr *vsub)
const char *vlr_subscr_name(const struct vlr_subscr *vsub)
{
static char buf[32];
if (!vsub)
@ -98,7 +98,7 @@ const char *vlr_subscr_name(struct vlr_subscr *vsub)
return buf;
}
const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub)
const char *vlr_subscr_msisdn_or_name(const struct vlr_subscr *vsub)
{
if (!vsub || !vsub->msisdn[0])
return vlr_subscr_name(vsub);