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

scpi: Minor style nits 

Drop an initial assignment to a variable which never takes effect.
Add braces around the body of a more complex if block. Separate routines
from each other by exactly one empty line.
This commit is contained in:
Gerhard Sittig 2016-12-30 13:11:59 +01:00 committed by Uwe Hermann
parent d431e4ec28
commit d3de86f3ca
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scpi/scpi.c
View File

@ -419,12 +419,13 @@ SR_PRIV int sr_scpi_get_data(struct sr_scpi_dev_inst *scpi,
GString *response; GString *response;
gint64 laststart; gint64 laststart;
unsigned int elapsed_ms; unsigned int elapsed_ms;
unsigned int offset = 0; unsigned int offset;
int space; int space;
if (command) if (command) {
if (sr_scpi_send(scpi, command) != SR_OK) if (sr_scpi_send(scpi, command) != SR_OK)
return SR_ERR; return SR_ERR;
}
if (sr_scpi_read_begin(scpi) != SR_OK) if (sr_scpi_read_begin(scpi) != SR_OK)
return SR_ERR; return SR_ERR;
@ -723,6 +724,7 @@ SR_PRIV int sr_scpi_get_uint8v(struct sr_scpi_dev_inst *scpi,
return ret; return ret;
} }
/** /**
* Send a SCPI command, read the reply, parse it as binary data with a * Send a SCPI command, read the reply, parse it as binary data with a
* "definite length block" header and store the as an result in scpi_response. * "definite length block" header and store the as an result in scpi_response.
@ -796,7 +798,6 @@ SR_PRIV int sr_scpi_get_block(struct sr_scpi_dev_inst *scpi,
return ret; return ret;
} }
/** /**
* Send the *IDN? SCPI command, receive the reply, parse it and store the * Send the *IDN? SCPI command, receive the reply, parse it and store the
* reply as a sr_scpi_hw_info structure in the supplied scpi_response pointer. * reply as a sr_scpi_hw_info structure in the supplied scpi_response pointer.