rigol-ds1xx2: Whitespace, minor fix.

Return SR_ERR_MALLOC for failed malloc, not SR_ERR.

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 073dc1de01719a3a3487106a89639f8b6b4cb103..cdbdaad66ee9a01e48be11fb8404185f66705b7a 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -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));
                break;
        case SR_CONF_COUPLING:
-                       *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
-                       break;
+               *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+               break;
        case SR_CONF_VDIV:
                g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                for (i = 0; i < ARRAY_SIZE(vdivs); i++) {

diff --git a/hardware/rigol-ds1xx2/protocol.c b/hardware/rigol-ds1xx2/protocol.c
index fcac2cf59c59efcc642c9111cebe52e7d956cd8a..d95716d7a59e3abef63dc487e7f40501adeac3b9 100644 (file)
--- a/hardware/rigol-ds1xx2/protocol.c
+++ b/hardware/rigol-ds1xx2/protocol.c
@@ -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)
                return SR_ERR;
        *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);
                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)))
-               return SR_ERR;
+               return SR_ERR_MALLOC;
 
        if (get_cfg(sdi, cmd, *buf) != SR_OK)
                return SR_ERR;