]> sigrok.org Git - libsigrok.git/commitdiff
Revert "scpi: Don't process received data of zero length"
authorGerhard Sittig <redacted>
Sat, 7 Jan 2017 20:16:33 +0000 (21:16 +0100)
committerGerhard Sittig <redacted>
Sat, 7 Jan 2017 20:36:52 +0000 (21:36 +0100)
Undo the change which skips management activities when no data was
received. This change breaks the current implementation, and needs to
get deferred until a delicate interaction between the resize and the
read logic has been eliminated.

src/scpi/scpi.c

index f743f64d6b75d5f072cc2e8af8e8195e5b881113..f87bf9eba239325107a1903eb6d682bd6f282028 100644 (file)
@@ -448,9 +448,9 @@ SR_PRIV int sr_scpi_get_data(struct sr_scpi_dev_inst *scpi,
                        return SR_ERR;
                } else if (len > 0) {
                        laststart = g_get_monotonic_time();
-                       offset += len;
-                       g_string_set_size(response, offset);
                }
+               offset += len;
+               g_string_set_size(response, offset);
                elapsed_ms = (g_get_monotonic_time() - laststart) / 1000;
                if (elapsed_ms >= scpi->read_timeout_ms) {
                        sr_err("Timed out waiting for SCPI response.");