X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fvcd.c;h=e69a80715676152df8d37a4a8acc644978d503d4;hb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;hp=e6bc05e5a6b18130524f7b8d11d85ece2ca054f1;hpb=0af636bed97c174bea46e61e961eaa1b0b162e0f;p=libsigrok.git

diff --git a/src/input/vcd.c b/src/input/vcd.c
index e6bc05e5..e69a8071 100644
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -404,7 +404,6 @@ static void parse_contents(const struct sr_input *in, char *data)
 
 static int init(struct sr_input *in, GHashTable *options)
 {
-	struct sr_channel *ch;
 	int num_channels, i;
 	char name[16];
 	struct context *inc;
@@ -429,13 +428,12 @@ static int init(struct sr_input *in, GHashTable *options)
 	inc->skip = g_variant_get_int32(g_hash_table_lookup(options, "skip"));
 	inc->skip /= inc->downsample;
 
-	in->sdi = sr_dev_inst_new();
+	in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	in->priv = inc;
 
 	for (i = 0; i < num_channels; i++) {
 		snprintf(name, 16, "%d", i);
-		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name);
-		in->sdi->channels = g_slist_append(in->sdi->channels, ch);
+		sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
 	}
 
 	return SR_OK;
@@ -503,7 +501,7 @@ static int receive(struct sr_input *in, GString *buf)
 	if (!inc->got_header) {
 		if (!have_header(in->buf))
 			return SR_OK;
-		if (!parse_header(in, in->buf) != SR_OK)
+		if (!parse_header(in, in->buf))
 			/* There was a header in there, but it was malformed. */
 			return SR_ERR;
 
@@ -569,6 +567,7 @@ SR_PRIV struct sr_input_module input_vcd = {
 	.id = "vcd",
 	.name = "VCD",
 	.desc = "Value Change Dump",
+	.exts = (const char*[]){"vcd", NULL},
 	.metadata = { SR_INPUT_META_HEADER | SR_INPUT_META_REQUIRED },
 	.options = get_options,
 	.format_match = format_match,