lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38356?usp=email )
Change subject: vlr: use correct types for vlr_timer ......................................................................
vlr: use correct types for vlr_timer
A timer T is always an integer. Also osmo_tdef_get returns an unsigned long. Match the types from osmo_tdef.
Change-Id: Ic46ddb578962619fc08bd63645c76852e676fcc9 --- M include/osmocom/vlr/vlr.h M src/libvlr/vlr.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/38356/1
diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index 27b40c2..90147ba 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -424,7 +424,7 @@ bool vlr_subscr_matches_msisdn(struct vlr_subscr *vsub, const char *msisdn); bool vlr_subscr_matches_imei(struct vlr_subscr *vsub, const char *imei);
-uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer); +unsigned long vlr_timer(struct vlr_instance *vlr, int timer);
int vlr_subscr_changed(struct vlr_subscr *vsub); int vlr_subscr_purge(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f160578..866a63d 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -203,7 +203,7 @@
/* This is just a wrapper around the osmo_tdef API. * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ -uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) +unsigned long vlr_timer(struct vlr_instance *vlr, int timer) { /* NOTE: since we usually do not need more than one instance of the VLR, * and since libosmocore's osmo_tdef API does not (yet) support dynamic