Change in osmo-msc[master]: drop duplicate ran_peer_find() vs ran_peer_find_by_addr()

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20278 )

Change subject: drop duplicate ran_peer_find() vs ran_peer_find_by_addr()
......................................................................

drop duplicate ran_peer_find() vs ran_peer_find_by_addr()

This is the same function existing twice with different names. Keep only one.

Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf
---
M include/osmocom/msc/ran_peer.h
M src/libmsc/ran_peer.c
2 files changed, 3 insertions(+), 15 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h
index 06ab500..bdca317 100644
--- a/include/osmocom/msc/ran_peer.h
+++ b/include/osmocom/msc/ran_peer.h
@@ -91,7 +91,7 @@
 };
 
 struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);
-struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);
+struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);
 
 void ran_peer_cells_seen_add(struct ran_peer *ran_peer, const struct gsm0808_cell_id *id);
 
@@ -106,4 +106,3 @@
 
 struct ran_peer *ran_peer_find_by_cell_id(struct sccp_ran_inst *sri, const struct gsm0808_cell_id *cid,
 					  bool expecting_single_match);
-struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr);
diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c
index 001dfb1..fcb5f5a 100644
--- a/src/libmsc/ran_peer.c
+++ b/src/libmsc/ran_peer.c
@@ -80,13 +80,13 @@
 
 struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)
 {
-	struct ran_peer *rp = ran_peer_find(sri, peer_addr);
+	struct ran_peer *rp = ran_peer_find_by_addr(sri, peer_addr);
 	if (rp)
 		return rp;
 	return ran_peer_alloc(sri, peer_addr);
 }
 
-struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)
+struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)
 {
 	struct ran_peer *rp;
 	llist_for_each_entry(rp, &sri->ran_peers, entry) {
@@ -624,17 +624,6 @@
 	return found;
 }
 
-struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr)
-{
-	struct ran_peer *rp;
-
-	llist_for_each_entry(rp, &sri->ran_peers, entry) {
-		if (!osmo_sccp_addr_ri_cmp(addr, &rp->peer_addr))
-			return rp;
-	}
-	return NULL;
-}
-
 int ran_peers_down_paging(struct sccp_ran_inst *sri, enum CELL_IDENT page_where, struct vlr_subscr *vsub,
 			  enum paging_cause cause)
 {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf
Gerrit-Change-Number: 20278
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200925/46ec69dc/attachment.htm>