<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10567">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm: Fix trailing whitespacing<br><br>Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc<br>---<br>M src/osmo-bsc/abis_nm.c<br>1 file changed, 15 insertions(+), 15 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/67/10567/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index f59a4fe..1092173 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -1041,7 +1041,7 @@</span><br><span> </span><br><span> sw_add_file_id_and_ver(sw, msg);</span><br><span> msgb_tv_put(msg, NM_ATT_WINDOW_SIZE, sw->window_size);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return abis_nm_sendmsg(sw->bts, msg);</span><br><span> }</span><br><span> </span><br><span>@@ -1252,7 +1252,7 @@</span><br><span> sw->file_version_len = strlen(file_version);</span><br><span> /* rewind to start of file */</span><br><span> rewind(sw->stream);</span><br><span style="color: hsl(0, 100%, 40%);">- break; </span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case GSM_BTS_TYPE_NANOBTS:</span><br><span> /* TODO: extract that from the filename or content */</span><br><span> rc = parse_sdp_header(sw);</span><br><span>@@ -1274,7 +1274,7 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void sw_close_file(struct abis_nm_sw *sw)</span><br><span> {</span><br><span> switch (sw->bts->type) {</span><br><span>@@ -1310,7 +1310,7 @@</span><br><span> int rc = -1;</span><br><span> struct abis_nm_sw *sw = &g_sw;</span><br><span> enum sw_state old_state = sw->state;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> //DEBUGP(DNM, "state %u, NM MT 0x%02x\n", sw->state, foh->msg_type);</span><br><span> </span><br><span> switch (sw->state) {</span><br><span>@@ -1557,7 +1557,7 @@</span><br><span> ch->attrib = NM_ATT_ABIS_CHANNEL;</span><br><span> ch->bts_port = bts_port;</span><br><span> ch->timeslot = ts_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- ch->subslot = subslot_nr; </span><br><span style="color: hsl(120, 100%, 40%);">+ ch->subslot = subslot_nr;</span><br><span> }</span><br><span> </span><br><span> int abis_nm_establish_tei(struct gsm_bts *bts, uint8_t trx_nr,</span><br><span>@@ -1572,7 +1572,7 @@</span><br><span> oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE);</span><br><span> fill_om_fom_hdr(oh, len, NM_MT_ESTABLISH_TEI, NM_OC_RADIO_CARRIER,</span><br><span> bts->bts_nr, trx_nr, 0xff);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msgb_tv_put(msg, NM_ATT_TEI, tei);</span><br><span> </span><br><span> ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch));</span><br><span>@@ -1593,7 +1593,7 @@</span><br><span> oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE);</span><br><span> fill_om_fom_hdr(oh, sizeof(*ch), NM_MT_CONN_TERR_SIGN,</span><br><span> NM_OC_RADIO_CARRIER, bts->bts_nr, trx->nr, 0xff);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch));</span><br><span> fill_nm_channel(ch, e1_port, e1_timeslot, e1_subslot);</span><br><span> </span><br><span>@@ -2313,7 +2313,7 @@</span><br><span> fill_om_fom_hdr(oh, 0, NM_MT_BS11_LMT_LOGOFF,</span><br><span> NM_OC_BS11_BTSE, 0xff, 0xff, 0xff);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return abis_nm_sendmsg(bts, msg);</span><br><span> }</span><br><span> </span><br><span>@@ -2340,7 +2340,7 @@</span><br><span> struct abis_om_hdr *oh;</span><br><span> struct msgb *msg;</span><br><span> uint8_t tlv_value;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msg = nm_msgb_alloc();</span><br><span> oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE);</span><br><span> fill_om_fom_hdr(oh, 3, NM_MT_BS11_SET_ATTR, NM_OC_BS11,</span><br><span>@@ -2350,9 +2350,9 @@</span><br><span> tlv_value = BS11_LI_PLL_LOCKED;</span><br><span> else</span><br><span> tlv_value = BS11_LI_PLL_STANDALONE;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msgb_tlv_put(msg, NM_ATT_BS11_PLL_MODE, 1, &tlv_value);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return abis_nm_sendmsg(bts, msg);</span><br><span> }</span><br><span> </span><br><span>@@ -2410,7 +2410,7 @@</span><br><span> </span><br><span> lh = queue->next;</span><br><span> llist_del(lh);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return llist_entry(lh, struct file_list_entry, list);</span><br><span> }</span><br><span> </span><br><span>@@ -2439,7 +2439,7 @@</span><br><span> </span><br><span> if (strlen(linebuf) < 4)</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = sscanf(linebuf+4, "%12s:%80s\r\n", file_id, file_version);</span><br><span> if (rc < 0) {</span><br><span> perror("ERR parsing SWL file");</span><br><span>@@ -2460,7 +2460,7 @@</span><br><span> strncat(fle->fname, dirname(dir), sizeof(fle->fname) - 1);</span><br><span> strcat(fle->fname, "/");</span><br><span> strncat(fle->fname, file_id, sizeof(fle->fname) - 1 -strlen(fle->fname));</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add_tail(&fle->list, &bs11_sw->file_list);</span><br><span> }</span><br><span> </span><br><span>@@ -2562,7 +2562,7 @@</span><br><span> NM_ATT_FILE_VERSION, NM_ATT_OPER_STATE, 0xe8, NM_ATT_BS11_ALL_TEST_CATG,</span><br><span> NM_ATT_SW_DESCR, NM_ATT_GET_ARI };</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static uint8_t req_attr[] = {</span><br><span> NM_ATT_ADM_STATE, NM_ATT_AVAIL_STATUS, 0xa8, NM_ATT_OPER_STATE,</span><br><span> 0xd5, 0xa1, NM_ATT_BS11_ESN_FW_CODE_NO, NM_ATT_BS11_ESN_HW_CODE_NO,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10567">change 10567</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/10567"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc </div>
<div style="display:none"> Gerrit-Change-Number: 10567 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>