X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fvcd.c;h=4af1a457a0bf575eaacd032ba7fbd54642a4f86f;hb=c10ef17c23f9493e70227d8514254facf74cabd6;hp=8111c59cf757237149be9026100a4d6a0fa3c1c1;hpb=41d214f61a1683fca49b9dc687045afc2ce42007;p=libsigrok.git diff --git a/src/input/vcd.c b/src/input/vcd.c index 8111c59c..4af1a457 100644 --- a/src/input/vcd.c +++ b/src/input/vcd.c @@ -70,6 +70,7 @@ #define CHUNKSIZE 1024 struct context { + gboolean started; gboolean got_header; uint64_t samplerate; unsigned int maxchannels; @@ -467,13 +468,6 @@ static int receive(const struct sr_input *in, GString *buf) uint64_t samplerate; char *p; - if (buf->len == 0) { - /* End of stream. */ - packet.type = SR_DF_END; - sr_session_send(in->sdi, &packet); - return SR_OK; - } - g_string_append_len(in->buf, buf->str, buf->len); inc = in->priv; @@ -485,6 +479,7 @@ static int receive(const struct sr_input *in, GString *buf) return SR_ERR; std_session_send_df_header(in->sdi, LOG_PREFIX); + inc->started = TRUE; packet.type = SR_DF_META; packet.payload = &meta; @@ -508,9 +503,16 @@ static int receive(const struct sr_input *in, GString *buf) static int cleanup(struct sr_input *in) { + struct sr_datafeed_packet packet; struct context *inc; inc = in->priv; + if (inc->started) { + /* End of stream. */ + packet.type = SR_DF_END; + sr_session_send(in->sdi, &packet); + } + g_slist_free_full(inc->channels, free_channel); g_free(inc); in->priv = NULL;