X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fgnuplot.c;h=053f042495bdd45adbbb44f14e4f54c26fbf6c31;hb=0f2627632944d27fcd561a8b3a4713869b326232;hp=7af417400ebd61c3cc336bbcd81bd1b7ea5cf203;hpb=a755b0e122105d934c4e7b97435420eda6df6e8e;p=libsigrok.git diff --git a/src/output/gnuplot.c b/src/output/gnuplot.c index 7af41740..053f0424 100644 --- a/src/output/gnuplot.c +++ b/src/output/gnuplot.c @@ -43,7 +43,6 @@ static const char *gnuplot_header2 = "\ # -----------------------------------------------------------------------------\n\ # 0\t\tSample counter (for internal gnuplot purposes)\n"; - static int init(struct sr_output *o, GHashTable *options) { struct context *ctx; @@ -57,7 +56,7 @@ static int init(struct sr_output *o, GHashTable *options) return SR_ERR_ARG; ctx = g_malloc0(sizeof(struct context)); - o->internal = ctx; + o->priv = ctx; ctx->num_enabled_channels = 0; for (l = o->sdi->channels; l; l = l->next) { ch = l->data; @@ -96,7 +95,7 @@ static GString *gen_header(const struct sr_output *o) unsigned int num_channels, i; char *samplerate_s; - ctx = o->internal; + ctx = o->priv; if (ctx->samplerate == 0) { if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE, &gvar) == SR_OK) { @@ -144,9 +143,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p unsigned int curbit, p, idx, i; *out = NULL; - if (!o || !o->internal) + if (!o || !o->priv) return SR_ERR_BUG; - ctx = o->internal; + ctx = o->priv; if (packet->type == SR_DF_META) { meta = packet->payload; @@ -207,9 +206,9 @@ static int cleanup(struct sr_output *o) { struct context *ctx; - if (!o || !o->internal) + if (!o || !o->priv) return SR_ERR_BUG; - ctx = o->internal; + ctx = o->priv; g_free(ctx->channel_index); g_free(ctx->prevsample); g_free(ctx); @@ -220,7 +219,8 @@ static int cleanup(struct sr_output *o) SR_PRIV struct sr_output_module output_gnuplot = { .id = "gnuplot", .name = "Gnuplot", - .desc = "Gnuplot file format", + .desc = "Gnuplot data file format", + .exts = (const char*[]){"dat", NULL}, .options = NULL, .init = init, .receive = receive,