<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23938">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_lchan_name_compute with ctx<br><br>Use a talloc ctx directly without an intermediate static buffer.<br><br>A subsequent patch will add a name tweak for VAMOS secondary lchans, so<br>it felt appropriate to first clean this.<br><br>Change-Id: Idb922605c15242a2cdc7c34668c845a179a15660<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bts_trx.c<br>M src/osmo-bsc/gsm_data.c<br>3 files changed, 5 insertions(+), 10 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/38/23938/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 0bc881b..9aecd2c 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -944,7 +944,7 @@</span><br><span> const char *gsm_chreq_name(enum gsm_chreq_reason_t c);</span><br><span> char *gsm_ts_name(const struct gsm_bts_trx_ts *ts);</span><br><span> char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts);</span><br><span style="color: hsl(0, 100%, 40%);">-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+char *gsm_lchan_name_compute(void *ctx, const struct gsm_lchan *lchan);</span><br><span> </span><br><span> static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 6d98929..1dfca95 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -105,15 +105,13 @@</span><br><span> </span><br><span>            for (l = 0; l < TS_MAX_LCHAN; l++) {</span><br><span>                      struct gsm_lchan *lchan;</span><br><span style="color: hsl(0, 100%, 40%);">-                        char *name;</span><br><span>                  lchan = &ts->lchan[l];</span><br><span> </span><br><span>                    lchan->ts = ts;</span><br><span>                   lchan->nr = l;</span><br><span>                    lchan->type = GSM_LCHAN_NONE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                    name = gsm_lchan_name_compute(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-                   lchan->name = talloc_strdup(trx, name);</span><br><span style="color: hsl(120, 100%, 40%);">+                    lchan->name = gsm_lchan_name_compute(trx, lchan);</span><br><span>                 }</span><br><span>    }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 916ba68..47aceb0 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -334,14 +334,11 @@</span><br><span>       return ts2str;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+char *gsm_lchan_name_compute(void *ctx, const struct gsm_lchan *lchan)</span><br><span> {</span><br><span>      struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d,ss=%d)",</span><br><span style="color: hsl(0, 100%, 40%);">-                ts->trx->bts->nr, ts->trx->nr, ts->nr, lchan->nr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        return ts2str;</span><br><span style="color: hsl(120, 100%, 40%);">+        return talloc_asprintf(ctx, "(bts=%d,trx=%d,ts=%d,ss=%d)",</span><br><span style="color: hsl(120, 100%, 40%);">+                         ts->trx->bts->nr, ts->trx->nr, ts->nr, lchan->nr);</span><br><span> }</span><br><span> </span><br><span> /* obtain the MO structure for a given object instance */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23938">change 23938</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/+/23938"/><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: Idb922605c15242a2cdc7c34668c845a179a15660 </div>
<div style="display:none"> Gerrit-Change-Number: 23938 </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>