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

rigol-ds1xx2: Whitespace, minor fix. 

Return SR_ERR_MALLOC for failed malloc, not SR_ERR.
This commit is contained in:
Uwe Hermann 2013-04-12 18:44:28 +02:00
parent 34e4c27391
commit 169dbe8577
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/rigol-ds1xx2/api.c
View File

@ -483,8 +483,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
*data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
break; break;
case SR_CONF_VDIV: case SR_CONF_VDIV:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
for (i = 0; i < ARRAY_SIZE(vdivs); i++) { for (i = 0; i < ARRAY_SIZE(vdivs); i++) {

4
hardware/rigol-ds1xx2/protocol.c
View File

@ -155,7 +155,7 @@ static int get_cfg_float(const struct sr_dev_inst *sdi, char *cmd, float *f)
if (get_cfg(sdi, cmd, buf) != SR_OK) if (get_cfg(sdi, cmd, buf) != SR_OK)
return SR_ERR; return SR_ERR;
*f = strtof(buf, &e); *f = strtof(buf, &e);
if (e == buf || (fpclassify(*f) & (FP_ZERO|FP_NORMAL)) == 0) { if (e == buf || (fpclassify(*f) & (FP_ZERO | FP_NORMAL)) == 0) {
sr_dbg("failed to parse response to '%s': '%s'", cmd, buf); sr_dbg("failed to parse response to '%s': '%s'", cmd, buf);
return SR_ERR; return SR_ERR;
} }
@ -167,7 +167,7 @@ static int get_cfg_string(const struct sr_dev_inst *sdi, char *cmd, char **buf)
{ {
if (!(*buf = g_try_malloc0(256))) if (!(*buf = g_try_malloc0(256)))
return SR_ERR; return SR_ERR_MALLOC;
if (get_cfg(sdi, cmd, *buf) != SR_OK) if (get_cfg(sdi, cmd, *buf) != SR_OK)
return SR_ERR; return SR_ERR;