<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13322">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vlr_subscr_name(): use OSMO_STRBUF<br><br>We now have a nicer way to compose strings in a buffer than this.<br>(Cosmetic preparation for inter-MSC handover patch.)<br><br>Change-Id: I7813068032475deb3850af05f7ba5a6f652e7fa2<br>---<br>M src/libvlr/vlr.c<br>1 file changed, 5 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/13322/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index c5b3c80..cd4209d 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -84,33 +84,29 @@</span><br><span> const char *vlr_subscr_name(const struct vlr_subscr *vsub)</span><br><span> {</span><br><span>    static char buf[128];</span><br><span style="color: hsl(0, 100%, 40%);">-   char imsi[23] = "";</span><br><span style="color: hsl(0, 100%, 40%);">-   char msisdn[25] = "";</span><br><span style="color: hsl(0, 100%, 40%);">- char tmsi[23] = "";</span><br><span style="color: hsl(0, 100%, 40%);">-   char tmsi_new[23] = "";</span><br><span style="color: hsl(120, 100%, 40%);">+     struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };</span><br><span>  bool present = false;</span><br><span>        if (!vsub)</span><br><span>           return "unknown";</span><br><span>  if (vsub->imsi[0]) {</span><br><span style="color: hsl(0, 100%, 40%);">-         snprintf(imsi, sizeof(imsi), "IMSI-%s", vsub->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+             OSMO_STRBUF_PRINTF(sb, "IMSI-%s", vsub->imsi);</span><br><span>          present = true;</span><br><span>      }</span><br><span>    if (vsub->msisdn[0]) {</span><br><span style="color: hsl(0, 100%, 40%);">-               snprintf(msisdn, sizeof(msisdn), "%sMSISDN-%s", present? ":" : "", vsub->msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+            OSMO_STRBUF_PRINTF(sb, "%sMSISDN-%s", present? ":" : "", vsub->msisdn);</span><br><span>             present = true;</span><br><span>      }</span><br><span>    if (vsub->tmsi != GSM_RESERVED_TMSI) {</span><br><span style="color: hsl(0, 100%, 40%);">-               snprintf(tmsi, sizeof(tmsi), "%sTMSI-0x%08X", present? ":" : "", vsub->tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+                OSMO_STRBUF_PRINTF(sb, "%sTMSI-0x%08X", present? ":" : "", vsub->tmsi);</span><br><span>             present = true;</span><br><span>      }</span><br><span>    if (vsub->tmsi_new != GSM_RESERVED_TMSI) {</span><br><span style="color: hsl(0, 100%, 40%);">-           snprintf(tmsi_new, sizeof(tmsi_new), "%sTMSInew-0x%08X", present? ":" : "", vsub->tmsi_new);</span><br><span style="color: hsl(120, 100%, 40%);">+         OSMO_STRBUF_PRINTF(sb, "%sTMSInew-0x%08X", present? ":" : "", vsub->tmsi_new);</span><br><span>              present = true;</span><br><span>      }</span><br><span>    if (!present)</span><br><span>                return "unknown";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buf, sizeof(buf), "%s%s%s%s", imsi, msisdn, tmsi, tmsi_new);</span><br><span>      return buf;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13322">change 13322</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/13322"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7813068032475deb3850af05f7ba5a6f652e7fa2 </div>
<div style="display:none"> Gerrit-Change-Number: 13322 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>