output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / motech-lps-30x / protocol.c

diff --git a/src/hardware/motech-lps-30x/protocol.c b/src/hardware/motech-lps-30x/protocol.c
index c952ed0bc6bf7b91f02a20ef8369b2ff93336a65..b31f2ee1d33ad83bcf48f33e8881a32f55290f4b 100644 (file)
--- a/src/hardware/motech-lps-30x/protocol.c
+++ b/src/hardware/motech-lps-30x/protocol.c
@@ -76,6 +76,8 @@ static void process_line(struct sr_dev_inst *sdi)
        int auxint;
 
        devc = sdi->priv;
+       if (!devc)
+               return;
 
        switch (devc->acq_req_pending) {
        case 0: /* Should not happen... */
@@ -87,13 +89,15 @@ static void process_line(struct sr_dev_inst *sdi)
                case AQ_U2:
                case AQ_I1:
                case AQ_I2:
-                       if (sr_atod(devc->buf, &dbl) != SR_OK) {
+                       dbl = 0.0;
+                       if (sr_atod_ascii(devc->buf, &dbl) != SR_OK) {
                                sr_err("Failed to convert '%s' to double, errno=%d %s",
                                        devc->buf, errno, g_strerror(errno));
                                dbl = 0.0;
                        }
                        break;
                case AQ_STATUS:
+                       auxint = 0;
                        if (sr_atoi(devc->buf, &auxint) != SR_OK) {
                                sr_err("Failed to convert '%s' to int, errno=%d %s",
                                        devc->buf, errno, g_strerror(errno));