aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2021-05-29 21:43:28 +0000
committerNeels Hofmeyr <neels@hofmeyr.de>2021-06-10 16:15:35 +0200
commitf1b0bf5b2f5ebe2c0b372fa858ea7850c93d5b36 (patch)
tree4e142487e0eb7af144f4772ba6178f9dc9677e4e /src
parent95ec269f0a7c3c0f69faf2912ea4952f391d3167 (diff)
lchan_fsm: lchan_fail() strings should not have a terminating newline
Diffstat (limited to 'src')
-rw-r--r--src/osmo-bsc/lchan_fsm.c16
-rw-r--r--src/osmo-bsc/lchan_rtp_fsm.c4
2 files changed, 10 insertions, 10 deletions
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index c56be8d78..03ccec085 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -720,7 +720,7 @@ static void lchan_fsm_wait_ts_ready(struct osmo_fsm_inst *fi, uint32_t event, vo
return;
}
- lchan_fail("Failed to setup RTP stream: %s in state %s\n",
+ lchan_fail("Failed to setup RTP stream: %s in state %s",
osmo_fsm_event_name(fi->fsm, event),
osmo_fsm_inst_state_name(fi));
return;
@@ -858,7 +858,7 @@ static void lchan_fsm_post_activ_ack(struct osmo_fsm_inst *fi)
case ACTIVATE_FOR_MS_CHANNEL_REQUEST:
rc = rsl_tx_imm_assignment(lchan);
if (rc) {
- lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)\n",
+ lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)",
rc, strerror(-rc));
return;
}
@@ -961,7 +961,7 @@ static void lchan_fsm_wait_rll_rtp_establish(struct osmo_fsm_inst *fi, uint32_t
return;
}
- lchan_fail("Failed to setup RTP stream: %s in state %s\n",
+ lchan_fail("Failed to setup RTP stream: %s in state %s",
osmo_fsm_event_name(fi->fsm, event),
osmo_fsm_inst_state_name(fi));
return;
@@ -986,7 +986,7 @@ static void lchan_fsm_wait_rr_chan_mode_modify_ack(struct osmo_fsm_inst *fi, uin
return;
case LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR:
- lchan_fail("Failed to change channel mode on the MS side: %s in state %s\n",
+ lchan_fail("Failed to change channel mode on the MS side: %s in state %s",
osmo_fsm_event_name(fi->fsm, event),
osmo_fsm_inst_state_name(fi));
return;
@@ -1003,7 +1003,7 @@ static void lchan_fsm_wait_rsl_chan_mode_modify_ack_onenter(struct osmo_fsm_inst
rc = rsl_chan_mode_modify_req(lchan);
if (rc < 0) {
- lchan_fail("Failed to send rsl message to change the channel mode on the BTS side: state %s\n",
+ lchan_fail("Failed to send rsl message to change the channel mode on the BTS side: state %s",
osmo_fsm_inst_state_name(fi));
}
}
@@ -1046,7 +1046,7 @@ static void lchan_fsm_wait_rsl_chan_mode_modify_ack(struct osmo_fsm_inst *fi, ui
return;
case LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK:
- lchan_fail("Failed to change channel mode on the BTS side: %s in state %s\n",
+ lchan_fail("Failed to change channel mode on the BTS side: %s in state %s",
osmo_fsm_event_name(fi->fsm, event),
osmo_fsm_inst_state_name(fi));
return;
@@ -1155,7 +1155,7 @@ static void lchan_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void
return;
}
- lchan_fail("RTP stream closed unexpectedly: %s in state %s\n",
+ lchan_fail("RTP stream closed unexpectedly: %s in state %s",
osmo_fsm_event_name(fi->fsm, event),
osmo_fsm_inst_state_name(fi));
return;
@@ -1179,7 +1179,7 @@ static void lchan_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void
if (gsm48_chan_mode_to_non_vamos(modif_info->ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) {
if (lchan_mr_config(&lchan->modify.mr_conf_filtered, lchan, modif_info->ch_mode_rate.s15_s0)
< 0) {
- lchan_fail("Can not generate multirate configuration IE\n");
+ lchan_fail("Can not generate multirate configuration IE");
return;
}
}
diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c
index 3ba418920..7bd8209c7 100644
--- a/src/osmo-bsc/lchan_rtp_fsm.c
+++ b/src/osmo-bsc/lchan_rtp_fsm.c
@@ -270,7 +270,7 @@ static void lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter(struct osmo_fsm_inst *fi,
val = ipacc_speech_mode(lchan->activate.ch_mode_rate.chan_mode, lchan->type);
if (val < 0) {
- lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s\n",
+ lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s",
get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode),
gsm_lchant_name(lchan->type));
return;
@@ -279,7 +279,7 @@ static void lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter(struct osmo_fsm_inst *fi,
val = ipacc_payload_type(lchan->activate.ch_mode_rate.chan_mode, lchan->type);
if (val < 0) {
- lchan_rtp_fail("Cannot determine Abis/IP payload type for tch_mode=%s type=%s\n",
+ lchan_rtp_fail("Cannot determine Abis/IP payload type for tch_mode=%s type=%s",
get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode),
gsm_lchant_name(lchan->type));
return;