session: free memory for datafeed callbacks, reported by valgrind

[libsigrok.git] / src / dmm / vc870.c

diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index 8b7f191f85c4fd8b7faffefca31cdefd2d5b9ee3..ac04e640c4148d00781d587084c3b2c8e43dfc02 100644 (file)
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
@@ -70,8 +71,9 @@ static int parse_value(const uint8_t *buf, struct vc870_info *info,
        } else if (!isdigit(buf[3]) || !isdigit(buf[4]) ||
                   !isdigit(buf[5]) || !isdigit(buf[6]) || !isdigit(buf[7])) {
                sr_dbg("Invalid digits: %02x %02x %02x %02x %02X "
-                      "(%c %c %c %c %c).", buf[3], buf[4], buf[5], buf[6],
-                      buf[7]);
+                       "(%c %c %c %c %c).",
+                       buf[3], buf[4], buf[5], buf[6], buf[7],
+                       buf[3], buf[4], buf[5], buf[6], buf[7]);
                return SR_ERR;
        }
 
@@ -278,7 +280,7 @@ static void parse_flags(const uint8_t *buf, struct vc870_info *info)
        info->is_rms = TRUE;
 }
 
-static void handle_flags(struct sr_datafeed_analog *analog,
+static void handle_flags(struct sr_datafeed_analog_old *analog,
                         float *floatval, const struct vc870_info *info)
 {
        /*
@@ -400,13 +402,11 @@ SR_PRIV gboolean sr_vc870_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval,
-                          struct sr_datafeed_analog *analog, void *info)
+                          struct sr_datafeed_analog_old *analog, void *info)
 {
        int ret;
        struct vc870_info *info_local;
 
-       info_local = (struct vc870_info *)info;
-
        info_local = (struct vc870_info *)info;
        memset(info_local, 0, sizeof(struct vc870_info));