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

config_set(): Don't check for sdi->priv != NULL. 

Instead, have the backend check that sdi->priv is not NULL (which
many drivers have been assuming already anyway).
This commit is contained in:
Uwe Hermann 2016-05-14 15:25:19 +02:00
parent e5b7eef797
commit b0baddef56
19 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/agilent-dmm/api.c
View File

@ -166,10 +166,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
switch (key) {
case SR_CONF_LIMIT_MSEC:

5
src/hardware/appa-55ii/api.c
View File

@ -149,10 +149,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
switch (key) {
case SR_CONF_LIMIT_SAMPLES:

5
src/hardware/brymen-bm86x/api.c
View File

@ -184,10 +184,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->sw_limits, key, data);
}

5
src/hardware/brymen-dmm/api.c
View File

@ -137,10 +137,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->sw_limits, key, data);
}

5
src/hardware/cem-dt-885x/api.c
View File

@ -217,10 +217,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
ret = SR_OK;
switch (key) {

3
src/hardware/chronovu-la/api.c
View File

@ -351,8 +351,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv))
return SR_ERR_BUG;
devc = sdi->priv;
switch (key) {
case SR_CONF_SAMPLERATE:

5
src/hardware/colead-slm/api.c
View File

@ -102,10 +102,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->limits, key, data);
}

5
src/hardware/fluke-dmm/api.c
View File

@ -194,10 +194,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
switch (key) {
case SR_CONF_LIMIT_MSEC:

5
src/hardware/gmc-mh-1x-2x/protocol.c
View File

@ -1519,10 +1519,7 @@ SR_PRIV int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *s
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
switch (key) {
case SR_CONF_POWER_OFF:

4
src/hardware/gwinstek-gds-800/api.c
View File

@ -148,12 +148,14 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
(void)cg;
if (!sdi || !(devc = sdi->priv))
if (!sdi)
return SR_ERR_ARG;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
switch (key) {
case SR_CONF_LIMIT_FRAMES:
devc->frame_limit = g_variant_get_uint64(data);

4
src/hardware/hameg-hmo/api.c
View File

@ -318,9 +318,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
double tmp_d;
gboolean update_sample_rate;
if (!sdi || !(devc = sdi->priv))
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;

3
src/hardware/kern-scale/api.c
View File

@ -125,8 +125,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv))
return SR_ERR_BUG;
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->limits, key, data);
}

1
src/hardware/link-mso19/api.c
View File

@ -284,6 +284,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
double pos;
(void)cg;
devc = sdi->priv;
if (sdi->status != SR_ST_ACTIVE)

5
src/hardware/norma-dmm/api.c
View File

@ -192,10 +192,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->limits, key, data);
}

3
src/hardware/rigol-ds/api.c
View File

@ -632,8 +632,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
const char *tmp_str;
char buffer[16];
if (!(devc = sdi->priv))
return SR_ERR_ARG;
devc = sdi->priv;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;

5
src/hardware/serial-dmm/api.c
View File

@ -151,10 +151,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->limits, key, data);
}

5
src/hardware/teleinfo/api.c
View File

@ -138,10 +138,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc = sdi->priv;
return sr_sw_limits_config_set(&devc->sw_limits, key, data);
}

5
src/hardware/zeroplus-logic-cube/api.c
View File

@ -380,10 +380,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) {
sr_err("%s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
devc = sdi->priv;
switch (key) {
case SR_CONF_SAMPLERATE:

5
src/hwdriver.c
View File

@ -722,7 +722,8 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver,
/**
* Set value of a configuration key in a device instance.
*
* @param[in] sdi The device instance.
* @param[in] sdi The device instance. Must not be NULL. sdi->driver and
* sdi->priv must not be NULL either.
* @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
@ -746,7 +747,7 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi,
g_variant_ref_sink(data);
if (!sdi || !sdi->driver || !data)
if (!sdi || !sdi->driver || !sdi->priv || !data)
ret = SR_ERR;
else if (!sdi->driver->config_set)
ret = SR_ERR_ARG;