windows: Fix various compiler warnings.

[libsigrok.git] / src / output / vcd.c

diff --git a/src/output/vcd.c b/src/output/vcd.c
index 87f8049603d6ff3733c91643e5d67188e72110ae..9d3516b74b30d8d22e9274f7251c1f9525a61af4 100644 (file)
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -39,16 +39,15 @@ struct context {
        uint64_t samplecount;
 };
 
-static const char *const vcd_header_comment =
-       "$comment\n  Acquisition with %d/%d channels at %s\n$end\n";
-
-static int init(struct sr_output *o)
+static int init(struct sr_output *o, GHashTable *options)
 {
        struct context *ctx;
        struct sr_channel *ch;
        GSList *l;
        int num_enabled_channels, i;
 
+       (void)options;
+
        num_enabled_channels = 0;
        for (l = o->sdi->channels; l; l = l->next) {
                ch = l->data;
@@ -64,7 +63,7 @@ static int init(struct sr_output *o)
        }
 
        ctx = g_malloc0(sizeof(struct context));
-       o->internal = ctx;
+       o->priv = ctx;
        ctx->num_enabled_channels = num_enabled_channels;
        ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
 
@@ -81,7 +80,7 @@ static int init(struct sr_output *o)
        return SR_OK;
 }
 
-static GString *gen_header(struct sr_output *o)
+static GString *gen_header(const struct sr_output *o)
 {
        struct context *ctx;
        struct sr_channel *ch;
@@ -92,7 +91,7 @@ static GString *gen_header(struct sr_output *o)
        int num_channels, i;
        char *samplerate_s, *frequency_s, *timestamp;
 
-       ctx = o->internal;
+       ctx = o->priv;
        header = g_string_sized_new(512);
        num_channels = g_slist_length(o->sdi->channels);
 
@@ -154,7 +153,7 @@ static GString *gen_header(struct sr_output *o)
        return header;
 }
 
-static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
                GString **out)
 {
        const struct sr_datafeed_meta *meta;
@@ -168,9 +167,9 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
        gboolean timestamp_written;
 
        *out = NULL;
-       if (!o || !o->internal)
+       if (!o || !o->priv)
                return SR_ERR_BUG;
-       ctx = o->internal;
+       ctx = o->priv;
 
        switch (packet->type) {
        case SR_DF_META:
@@ -249,10 +248,10 @@ static int cleanup(struct sr_output *o)
 {
        struct context *ctx;
 
-       if (!o || !o->internal)
+       if (!o || !o->priv)
                return SR_ERR_ARG;
 
-       ctx = o->internal;
+       ctx = o->priv;
        g_free(ctx->prevsample);
        g_free(ctx->channel_index);
        g_free(ctx);
@@ -260,9 +259,12 @@ static int cleanup(struct sr_output *o)
        return SR_OK;
 }
 
-struct sr_output_format output_vcd = {
+struct sr_output_module output_vcd = {
        .id = "vcd",
-       .description = "Value Change Dump (VCD)",
+       .name = "VCD",
+       .desc = "Value Change Dump",
+       .exts = (const char*[]){"vcd", NULL},
+       .options = NULL,
        .init = init,
        .receive = receive,
        .cleanup = cleanup,