pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/30265 )
Change subject: paging: Get rid of unneeded count returned
......................................................................
paging: Get rid of unneeded count returned
The return count is not used since there's no use for it. Get rid of it
to simplify the code.
Change-Id: I7bf04b94173f0ae7b26caf5d7f9abeeb9abf9b6c
---
M include/osmocom/bsc/paging.h
M src/osmo-bsc/paging.c
2 files changed, 8 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/30265/1
diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h
index a0b5bcb..8033fc0 100644
--- a/include/osmocom/bsc/paging.h
+++ b/include/osmocom/bsc/paging.h
@@ -126,7 +126,7 @@
/* schedule paging request */
int paging_request_bts(const struct bsc_paging_params *params, struct gsm_bts
*bts);
-int paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason
*reasons_p,
+void paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason
*reasons_p,
struct gsm_bts *bts, struct bsc_subscr *bsub);
int paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason
reasons);
diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c
index d4a97e4..e60efa8 100644
--- a/src/osmo-bsc/paging.c
+++ b/src/osmo-bsc/paging.c
@@ -522,9 +522,9 @@
* \param[out] returns the reason for a pending paging, if any.
* \param[in] bts BTS which has received a paging response.
* \param[in] bsub subscriber.
- * \returns number of pending pagings.
+ * \returns whether active request for the subscriber on bts was found
*/
-static int paging_request_stop_bts(struct bsc_msc_data **msc_p, enum
bsc_paging_reason *reason_p,
+static bool paging_request_stop_bts(struct bsc_msc_data **msc_p, enum
bsc_paging_reason *reason_p,
struct gsm_bts *bts, struct bsc_subscr *bsub)
{
struct gsm_bts_paging_state *bts_entry = &bts->paging;
@@ -541,10 +541,10 @@
*reason_p = req->reason;
LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging\n");
paging_remove_request(&bts->paging, req);
- return 1;
+ return true;
}
- return 0;
+ return false;
}
/*! Stop paging on all cells and return the MSC that paged (if any) and all
pending paging reasons.
@@ -552,20 +552,17 @@
* \param[out] returns the ORed bitmask of all reasons of pending pagings.
* \param[in] bts BTS which has received a paging response
* \param[in] bsub subscriber
- * \returns number of pending pagings.
*/
-int paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason
*reasons_p,
+void paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason
*reasons_p,
struct gsm_bts *bts, struct bsc_subscr *bsub)
{
struct gsm_bts *bts_i;
struct bsc_msc_data *paged_from_msc;
- int count;
enum bsc_paging_reason reasons;
OSMO_ASSERT(bts);
- count = paging_request_stop_bts(&paged_from_msc, &reasons, bts, bsub);
+ paging_request_stop_bts(&paged_from_msc, &reasons, bts, bsub);
if (paged_from_msc) {
- count++;
rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs,
BTS_CTR_PAGING_RESPONDED));
rate_ctr_inc(rate_ctr_group_get_ctr(bts->network->bsc_ctrs,
BSC_CTR_PAGING_RESPONDED));
}
@@ -577,7 +574,7 @@
if (bts_i == bts)
continue; /* Already handled above, avoid repeated
lookup */
- count += paging_request_stop_bts(&paged_from_msc2, &reason2,
bts_i, bsub);
+ paging_request_stop_bts(&paged_from_msc2, &reason2, bts_i,
bsub);
if (paged_from_msc2) {
reasons |= reason2;
if (!paged_from_msc) {
@@ -591,8 +588,6 @@
*msc_p = paged_from_msc;
*reasons_p = reasons;
-
- return count;
}
/* Remove all paging requests, for specific reasons only. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30265
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7bf04b94173f0ae7b26caf5d7f9abeeb9abf9b6c
Gerrit-Change-Number: 30265
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
