<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15280">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmobts_sock.cpp: pcu_sock_read(): further simplify the code<br><br>Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439<br>---<br>M src/osmobts_sock.cpp<br>1 file changed, 6 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp</span><br><span>index a3e9d63..4321696 100644</span><br><span>--- a/src/osmobts_sock.cpp</span><br><span>+++ b/src/osmobts_sock.cpp</span><br><span>@@ -143,22 +143,14 @@</span><br><span>    int rc;</span><br><span> </span><br><span>  rc = recv(bfd->fd, &pcu_prim, sizeof(pcu_prim), 0);</span><br><span style="color: hsl(0, 100%, 40%);">-      if (rc == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-            goto close;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                if (errno == EAGAIN)</span><br><span style="color: hsl(0, 100%, 40%);">-                    return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-               goto close;</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rc < 0 && errno == EAGAIN)</span><br><span style="color: hsl(120, 100%, 40%);">+             return 0; /* Try again later */</span><br><span style="color: hsl(120, 100%, 40%);">+       if (rc <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+             pcu_sock_close(state, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+             return -EIO;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   rc = pcu_rx(pcu_prim.msg_type, &pcu_prim);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-close:</span><br><span style="color: hsl(0, 100%, 40%);">-        pcu_sock_close(state, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-       return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    return pcu_rx(pcu_prim.msg_type, &pcu_prim);</span><br><span> }</span><br><span> </span><br><span> static int pcu_sock_write(struct osmo_fd *bfd)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15280">change 15280</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-pcu/+/15280"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 </div>
<div style="display:none"> Gerrit-Change-Number: 15280 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>