<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24597">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-octphy: drop talloc_replace(), use osmo_talloc_replace_string()<br><br>Change-Id: Ied39cc594fedc712d751ab1c7b636bbbff527bd6<br>---<br>M src/osmo-bts-octphy/l1_oml.c<br>1 file changed, 10 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/24597/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c</span><br><span>index 9bd01f4..c825581 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.c</span><br><span>@@ -1119,13 +1119,6 @@</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define talloc_replace(dst, ctx, src)                 \</span><br><span style="color: hsl(0, 100%, 40%);">-       do {                                            \</span><br><span style="color: hsl(0, 100%, 40%);">-               if (dst)                                \</span><br><span style="color: hsl(0, 100%, 40%);">-                       talloc_free(dst);               \</span><br><span style="color: hsl(0, 100%, 40%);">-               dst = talloc_strdup(ctx, (const char *) src);   \</span><br><span style="color: hsl(0, 100%, 40%);">-       } while (0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int app_info_sys_compl_cb(struct octphy_hdl *fl1h, struct msgb *resp, void *data)</span><br><span> {</span><br><span>         tOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP *aisr =</span><br><span>@@ -1145,8 +1138,10 @@</span><br><span>        LOGP(DL1C, LOGL_INFO, "Note: compiled without multi-trx support.\n");</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   talloc_replace(fl1h->info.system.platform, fl1h, aisr->szPlatform);</span><br><span style="color: hsl(0, 100%, 40%);">-       talloc_replace(fl1h->info.system.version, fl1h, aisr->szVersion);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_talloc_replace_string(fl1h->info.system.platform,</span><br><span style="color: hsl(120, 100%, 40%);">+                                fl1h, (const char *) aisr->szPlatform);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(fl1h->info.system.version,</span><br><span style="color: hsl(120, 100%, 40%);">+                                 fl1h, (const char *) aisr->szVersion);</span><br><span> </span><br><span>     msgb_free(resp);</span><br><span> </span><br><span>@@ -1210,9 +1205,12 @@</span><br><span>                }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   talloc_replace(fl1h->info.app.name, fl1h, air->szName);</span><br><span style="color: hsl(0, 100%, 40%);">-   talloc_replace(fl1h->info.app.description, fl1h, air->szDescription);</span><br><span style="color: hsl(0, 100%, 40%);">-     talloc_replace(fl1h->info.app.version, fl1h, air->szVersion);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_talloc_replace_string(fl1h->info.app.name,</span><br><span style="color: hsl(120, 100%, 40%);">+                               fl1h, (const char *) air->szName);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_talloc_replace_string(fl1h->info.app.description,</span><br><span style="color: hsl(120, 100%, 40%);">+                                fl1h, (const char *) air->szDescription);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_talloc_replace_string(fl1h->info.app.version,</span><br><span style="color: hsl(120, 100%, 40%);">+                            fl1h, (const char *) air->szVersion);</span><br><span>  OSMO_ASSERT(strlen(ver_hdr) < sizeof(pinst->version));</span><br><span>         osmo_strlcpy(pinst->version, ver_hdr, strlen(ver_hdr));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24597">change 24597</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-bts/+/24597"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ied39cc594fedc712d751ab1c7b636bbbff527bd6 </div>
<div style="display:none"> Gerrit-Change-Number: 24597 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>