Change in osmo-bsc[master]: cosmetic: dissolve error-goto with single source in handover_start()

[laforge]

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

Change subject: cosmetic: dissolve error-goto with single source in handover_start()
......................................................................

cosmetic: dissolve error-goto with single source in handover_start()

Change-Id: I9c7d10c36f3f868100c1aa2d0433ceed74161175
---
M src/osmo-bsc/handover_fsm.c
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c
index 90fa20b..bb5dcb1 100644
--- a/src/osmo-bsc/handover_fsm.c
+++ b/src/osmo-bsc/handover_fsm.c
@@ -330,8 +330,10 @@
 	ho->target_cell = req->target_nik;
 
 	if (find_handover_target_cell(&local_target_cell, &remote_target_cell,
-				      conn, search_for, true))
-		goto no_handover;
+				      conn, search_for, true)) {
+		handover_end(conn, HO_RESULT_FAIL_NO_CHANNEL);
+		return;
+	}
 
 	if (local_target_cell) {
 		ho->new_bts = local_target_cell;
@@ -346,9 +348,6 @@
 
 	/* should never reach this, because find_handover_target_cell() would have returned error. */
 	OSMO_ASSERT(false);
-
-no_handover:
-	handover_end(conn, HO_RESULT_FAIL_NO_CHANNEL);
 }
 
 /*! Hand over the specified logical channel to the specified new BTS and possibly change the lchan type.

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9c7d10c36f3f868100c1aa2d0433ceed74161175
Gerrit-Change-Number: 19893
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
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/20200830/b9658b91/attachment.htm>