Return SR_ERR_MALLOC upon allocation errors.

[libsigrok.git] / hardware / fluke-dmm / fluke.c

diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index 6506fd23fa672020aafb1ec02dad1ce96ecabb7d..f8544e99c29d83645c724515b3e765e9dcc2106f 100644 (file)
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -47,15 +47,17 @@ static struct sr_datafeed_analog *handle_qm_v1(const struct sr_dev_inst *sdi,
                fvalue = strtof(tokens[1], &e);
                if (fvalue == 0.0 && e == tokens[1]) {
                        /* Happens all the time, when switching modes. */
-                       sr_dbg("fluke-dmm: invalid float");
+                       sr_dbg("Invalid float.");
                        return NULL;
                }
        }
        while(*e && *e == ' ')
                e++;
 
+       /* TODO: Check malloc return value. */
        analog = g_try_malloc0(sizeof(struct sr_datafeed_analog));
        analog->num_samples = 1;
+       /* TODO: Check malloc return value. */
        analog->data = g_try_malloc(sizeof(float));
        if (is_oor)
                *analog->data = NAN;
@@ -158,12 +160,14 @@ static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
        (void)sdi;
        fvalue = strtof(tokens[0], &eptr);
        if (fvalue == 0.0 && eptr == tokens[0]) {
-               sr_err("fluke-dmm: invalid float");
+               sr_err("Invalid float.");
                return NULL;
        }
 
+       /* TODO: Check malloc return value. */
        analog = g_try_malloc0(sizeof(struct sr_datafeed_analog));
        analog->num_samples = 1;
+       /* TODO: Check malloc return value. */
        analog->data = g_try_malloc(sizeof(float));
        *analog->data = fvalue;
        analog->mq = -1;
@@ -263,12 +267,12 @@ static void handle_line(const struct sr_dev_inst *sdi)
        char **tokens;
 
        devc = sdi->priv;
-       sr_spew("fluke-dmm: received line '%s' (%d)", devc->buf, devc->buflen);
+       sr_spew("Received line '%s' (%d).", devc->buf, devc->buflen);
 
        if (devc->buflen == 1) {
                if (devc->buf[0] != '0') {
                        /* Not just a CMD_ACK from the query command. */
-                       sr_dbg("fluke-dmm: got CMD_ACK '%c'", devc->buf[0]);
+                       sr_dbg("Got CMD_ACK '%c'.", devc->buf[0]);
                        devc->expect_response = FALSE;
                }
                devc->buflen = 0;
@@ -342,9 +346,9 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
         * or temporary disconnect issues. */
        if ((devc->expect_response == FALSE && elapsed > devc->profile->poll_period)
                        || elapsed > 1000) {
-               sr_spew("fluke-dmm: sending QM");
+               sr_spew("Sending QM.");
                if (serial_write(devc->serial->fd, "QM\r", 3) == -1)
-                       sr_err("fluke-dmm: unable to send QM: %s", strerror(errno));
+                       sr_err("Unable to send QM: %s.", strerror(errno));
                devc->cmd_sent_at = now;
                devc->expect_response = TRUE;
        }