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

lecroy-xstream: fix several compiler warnings (assignment, memory) 

Remove an assignment that won't take effect. Check pointers' validity
before dereferencing. Fix a memory leak.

This was reported by clang's scan-build.
This commit is contained in:
Gerhard Sittig 2018-02-09 19:12:12 +01:00 committed by Uwe Hermann
parent b65adcedb8
commit f62c2ad65d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/lecroy-xstream/api.c
View File

@ -213,8 +213,6 @@ static int config_set(uint32_t key, GVariant *data,
model = devc->model_config; model = devc->model_config;
state = devc->model_state; state = devc->model_state;
ret = SR_ERR_NA;
switch (key) { switch (key) {
case SR_CONF_LIMIT_FRAMES: case SR_CONF_LIMIT_FRAMES:
devc->frame_limit = g_variant_get_uint64(data); devc->frame_limit = g_variant_get_uint64(data);
@ -324,6 +322,8 @@ static int config_list(uint32_t key, GVariant **data,
*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog)); *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
if (!model)
return SR_ERR_ARG;
*data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options); *data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:

2
src/hardware/lecroy-xstream/protocol.c
View File

@ -665,6 +665,8 @@ SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data)
return SR_ERR; return SR_ERR;
if (analog.num_samples == 0) { if (analog.num_samples == 0) {
g_free(analog.data);
/* No data available, we have to acquire data first. */ /* No data available, we have to acquire data first. */
g_snprintf(command, sizeof(command), "ARM;WAIT;*OPC;C%d:WAVEFORM?", ch->index + 1); g_snprintf(command, sizeof(command), "ARM;WAIT;*OPC;C%d:WAVEFORM?", ch->index + 1);
sr_scpi_send(sdi->conn, command); sr_scpi_send(sdi->conn, command);