<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13958">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/trx_if.c: use ssize_t for return value of read()<br><br>Change-Id: I4a489be6fafcd057c3edc4f3d5f76d645899f884<br>---<br>M src/host/trxcon/trx_if.c<br>1 file changed, 14 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/13958/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c</span><br><span>index e53fab2..35ad3c0 100644</span><br><span>--- a/src/host/trxcon/trx_if.c</span><br><span>+++ b/src/host/trxcon/trx_if.c</span><br><span>@@ -440,15 +440,16 @@</span><br><span> {</span><br><span> struct trx_instance *trx = ofd->data;</span><br><span> struct trx_ctrl_msg *tcm;</span><br><span style="color: hsl(0, 100%, 40%);">- int len, resp, rsp_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ int resp, rsp_len;</span><br><span> char buf[1500], *p;</span><br><span style="color: hsl(120, 100%, 40%);">+ ssize_t read_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- len = read(ofd->fd, buf, sizeof(buf) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (len <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_ERROR, "read() failed with rc=%d\n", len);</span><br><span style="color: hsl(0, 100%, 40%);">- return len;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_len = read(ofd->fd, buf, sizeof(buf) - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (read_len <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "read() failed with rc=%zd\n", read_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return read_len;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- buf[len] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[read_len] = '\0';</span><br><span> </span><br><span> if (!!strncmp(buf, "RSP ", 4)) {</span><br><span> LOGP(DTRX, LOGL_NOTICE, "Unknown message on CTRL port: %s\n", buf);</span><br><span>@@ -550,17 +551,17 @@</span><br><span> int8_t rssi, tn;</span><br><span> int16_t toa256;</span><br><span> uint32_t fn;</span><br><span style="color: hsl(0, 100%, 40%);">- int len;</span><br><span style="color: hsl(120, 100%, 40%);">+ ssize_t read_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- len = read(ofd->fd, buf, sizeof(buf));</span><br><span style="color: hsl(0, 100%, 40%);">- if (len <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRXD, LOGL_ERROR, "read() failed with rc=%d\n", len);</span><br><span style="color: hsl(0, 100%, 40%);">- return len;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_len = read(ofd->fd, buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (read_len <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRXD, LOGL_ERROR, "read() failed with rc=%zd\n", read_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return read_len;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (len != 158) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (read_len != 158) {</span><br><span> LOGP(DTRXD, LOGL_ERROR, "Got data message with invalid "</span><br><span style="color: hsl(0, 100%, 40%);">- "length '%d'\n", len);</span><br><span style="color: hsl(120, 100%, 40%);">+ "length '%zd'\n", read_len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13958">change 13958</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/13958"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4a489be6fafcd057c3edc4f3d5f76d645899f884 </div>
<div style="display:none"> Gerrit-Change-Number: 13958 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>