This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24460 )
Change subject: lchan_fsm: lchan_fail() strings should not have a terminating newline
......................................................................
lchan_fsm: lchan_fail() strings should not have a terminating newline
Change-Id: I063fd5598add75c39338d90798189c10a0714094
---
M src/osmo-bsc/lchan_fsm.c
M src/osmo-bsc/lchan_rtp_fsm.c
2 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/24460/1
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 1b8812a..0b9cc84 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -660,7 +660,7 @@
if (gsm48_chan_mode_to_non_vamos(lchan->activate.ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) {
if (lchan_mr_config(&lchan->activate.mr_conf_filtered, lchan, lchan->activate.ch_mode_rate.s15_s0) < 0) {
- lchan_fail("Can not generate multirate configuration IE\n");
+ lchan_fail("Can not generate multirate configuration IE");
return;
}
}
@@ -707,7 +707,7 @@
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;
@@ -845,7 +845,7 @@
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;
}
@@ -948,7 +948,7 @@
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;
@@ -973,7 +973,7 @@
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;
@@ -990,7 +990,7 @@
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));
}
}
@@ -1028,7 +1028,7 @@
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;
@@ -1137,7 +1137,7 @@
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;
@@ -1156,7 +1156,7 @@
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 0b1d4c5..58963e0 100644
--- a/src/osmo-bsc/lchan_rtp_fsm.c
+++ b/src/osmo-bsc/lchan_rtp_fsm.c
@@ -270,7 +270,7 @@
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 @@
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;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24460
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I063fd5598add75c39338d90798189c10a0714094
Gerrit-Change-Number: 24460
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210529/23afd630/attachment.htm>