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 submitted this change. ( 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, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index c56be8d..03ccec0 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -720,7 +720,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; @@ -858,7 +858,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; } @@ -961,7 +961,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; @@ -986,7 +986,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; @@ -1003,7 +1003,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)); } } @@ -1046,7 +1046,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; @@ -1155,7 +1155,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; @@ -1179,7 +1179,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 3ba4189..7bd8209 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: 19 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210610/77756e50/attachment.htm>