<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24460">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_fsm: lchan_fail() strings should not have a terminating newline<br><br>Change-Id: I063fd5598add75c39338d90798189c10a0714094<br>---<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>2 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/24460/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 1b8812a..0b9cc84 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -660,7 +660,7 @@</span><br><span> </span><br><span> if (gsm48_chan_mode_to_non_vamos(lchan->activate.ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) {</span><br><span> if (lchan_mr_config(&lchan->activate.mr_conf_filtered, lchan, lchan->activate.ch_mode_rate.s15_s0) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Can not generate multirate configuration IE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Can not generate multirate configuration IE");</span><br><span> return;</span><br><span> }</span><br><span> }</span><br><span>@@ -707,7 +707,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to setup RTP stream: %s in state %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to setup RTP stream: %s in state %s",</span><br><span> osmo_fsm_event_name(fi->fsm, event),</span><br><span> osmo_fsm_inst_state_name(fi));</span><br><span> return;</span><br><span>@@ -845,7 +845,7 @@</span><br><span> case ACTIVATE_FOR_MS_CHANNEL_REQUEST:</span><br><span> rc = rsl_tx_imm_assignment(lchan);</span><br><span> if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)",</span><br><span> rc, strerror(-rc));</span><br><span> return;</span><br><span> }</span><br><span>@@ -948,7 +948,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to setup RTP stream: %s in state %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to setup RTP stream: %s in state %s",</span><br><span> osmo_fsm_event_name(fi->fsm, event),</span><br><span> osmo_fsm_inst_state_name(fi));</span><br><span> return;</span><br><span>@@ -973,7 +973,7 @@</span><br><span> return;</span><br><span> </span><br><span> case LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to change channel mode on the MS side: %s in state %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to change channel mode on the MS side: %s in state %s",</span><br><span> osmo_fsm_event_name(fi->fsm, event),</span><br><span> osmo_fsm_inst_state_name(fi));</span><br><span> return;</span><br><span>@@ -990,7 +990,7 @@</span><br><span> </span><br><span> rc = rsl_chan_mode_modify_req(lchan);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to send rsl message to change the channel mode on the BTS side: state %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to send rsl message to change the channel mode on the BTS side: state %s",</span><br><span> osmo_fsm_inst_state_name(fi));</span><br><span> }</span><br><span> }</span><br><span>@@ -1028,7 +1028,7 @@</span><br><span> return;</span><br><span> </span><br><span> case LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to change channel mode on the BTS side: %s in state %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to change channel mode on the BTS side: %s in state %s",</span><br><span> osmo_fsm_event_name(fi->fsm, event),</span><br><span> osmo_fsm_inst_state_name(fi));</span><br><span> return;</span><br><span>@@ -1137,7 +1137,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("RTP stream closed unexpectedly: %s in state %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("RTP stream closed unexpectedly: %s in state %s",</span><br><span> osmo_fsm_event_name(fi->fsm, event),</span><br><span> osmo_fsm_inst_state_name(fi));</span><br><span> return;</span><br><span>@@ -1156,7 +1156,7 @@</span><br><span> if (gsm48_chan_mode_to_non_vamos(modif_info->ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) {</span><br><span> if (lchan_mr_config(&lchan->modify.mr_conf_filtered, lchan, modif_info->ch_mode_rate.s15_s0)</span><br><span> < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Can not generate multirate configuration IE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Can not generate multirate configuration IE");</span><br><span> return;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 0b1d4c5..58963e0 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -270,7 +270,7 @@</span><br><span> </span><br><span> val = ipacc_speech_mode(lchan->activate.ch_mode_rate.chan_mode, lchan->type);</span><br><span> if (val < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s",</span><br><span> get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode),</span><br><span> gsm_lchant_name(lchan->type));</span><br><span> return;</span><br><span>@@ -279,7 +279,7 @@</span><br><span> </span><br><span> val = ipacc_payload_type(lchan->activate.ch_mode_rate.chan_mode, lchan->type);</span><br><span> if (val < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_rtp_fail("Cannot determine Abis/IP payload type for tch_mode=%s type=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_rtp_fail("Cannot determine Abis/IP payload type for tch_mode=%s type=%s",</span><br><span> get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode),</span><br><span> gsm_lchant_name(lchan->type));</span><br><span> return;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24460">change 24460</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/24460"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I063fd5598add75c39338d90798189c10a0714094 </div>
<div style="display:none"> Gerrit-Change-Number: 24460 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>