neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27404 )

Change subject: fix extraneous newlines in ho_fail() invocations ......................................................................

fix extraneous newlines in ho_fail() invocations

The ho_fail() macro includes a newline, so the callers should not add one. Fix these cases where the extra '\n' fragments the logged message.

Related: SYS#5839 Change-Id: Ifdbce98be70c1aa127ae008d7a77b9795fd250d3 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 3 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/27404/1

diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 487135b..c25e061 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -647,7 +647,7 @@ ho_fsm_update_id(fi, "interBSCin");

if (!parse_ho_request(conn, ho_request_msg, req)) { - ho_fail(HO_RESULT_ERROR, "Invalid Handover Request message from MSC\n"); + ho_fail(HO_RESULT_ERROR, "Invalid Handover Request message from MSC"); return; }

@@ -723,7 +723,7 @@ chosen_a5_n = select_best_cipher(req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask); if (chosen_a5_n < 0) { ho_fail(HO_RESULT_FAIL_RR_HO_FAIL, - "There is no A5 encryption mode that both BSC and MSC permit: MSC 0x%x & BSC 0x%x = 0\n", + "There is no A5 encryption mode that both BSC and MSC permit: MSC 0x%x & BSC 0x%x = 0", req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask); return; } @@ -742,7 +742,7 @@ info.encr.alg_id = ALG_A5_NR_TO_RSL(chosen_a5_n); if (chosen_a5_n > 0) { if (req->ei.key_len > sizeof(info.encr.key)) { - ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u\n", + ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u", req->ei.key_len); return; }