ols: Get rid of gcc warnings

[libsigrok.git] / output / vcd.c

diff --git a/output/vcd.c b/output/vcd.c
index e1661e5c08cfc7367eecfd63315638f4f9fe9d32..829fcde7722e5d05b2b91a8d4590c72237d91ab4 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ static int init(struct sr_output *o)
        struct context *ctx;
        struct sr_probe *probe;
        GSList *l;
-       uint64_t *samplerate;
+       GVariant *gvar;
        int num_probes, i;
        char *samplerate_s, *frequency_s, *timestamp;
        time_t t;
@@ -93,17 +93,18 @@ static int init(struct sr_output *o)
                        PACKAGE, PACKAGE_VERSION);
 
        if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-               o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
-                               (const void **)&samplerate, o->sdi);
-               ctx->samplerate = *samplerate;
+               o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+               ctx->samplerate = g_variant_get_uint64(gvar);
                if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
                        g_string_free(ctx->header, TRUE);
                        g_free(ctx);
+                       g_variant_unref(gvar);
                        return SR_ERR;
                }
                g_string_append_printf(ctx->header, vcd_header_comment,
                                 ctx->num_enabled_probes, num_probes, samplerate_s);
                g_free(samplerate_s);
+               g_variant_unref(gvar);
        }
 
        /* timescale */
@@ -144,7 +145,7 @@ static int init(struct sr_output *o)
        return SR_OK;
 }
 
-static GString *recv(struct sr_output *o, const struct sr_dev_inst *sdi,
+static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet)
 {
        const struct sr_datafeed_logic *logic;
@@ -229,6 +230,6 @@ struct sr_output_format output_vcd = {
        .description = "Value Change Dump (VCD)",
        .df_type = SR_DF_LOGIC,
        .init = init,
-       .recv = recv,
-       .cleanup = cleanup
+       .recv = receive,
+       .cleanup = cleanup,
 };