BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi: Don't process received data of zero length 

When nothing was received in a read attempt, we need not adjust the
buffered data's read position nor the glib string object's size. Skip
any processing for empty input, just keep checking for timeouts.
This commit is contained in:
Gerhard Sittig 2016-12-30 13:16:04 +01:00 committed by Uwe Hermann
parent ad21865fa7
commit 900846816f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scpi/scpi.c
View File

@ -453,9 +453,9 @@ SR_PRIV int sr_scpi_get_data(struct sr_scpi_dev_inst *scpi,
return SR_ERR; return SR_ERR;
} else if (len > 0) { } else if (len > 0) {
laststart = g_get_monotonic_time(); laststart = g_get_monotonic_time();
offset += len;
g_string_set_size(response, offset);
} }
offset += len;
g_string_set_size(response, offset);
/* Quit reading after a period of time without receive data. */ /* Quit reading after a period of time without receive data. */
elapsed_ms = (g_get_monotonic_time() - laststart) / 1000; elapsed_ms = (g_get_monotonic_time() - laststart) / 1000;
if (elapsed_ms >= scpi->read_timeout_ms) { if (elapsed_ms >= scpi->read_timeout_ms) {