BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnuplot: Eliminate fixed-size header buffer based on max probes.

This commit is contained in:
Martin Ling 2013-04-26 22:50:09 +01:00 committed by Bert Vermeulen
parent deb0908338
commit 90f680ff00
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
output/gnuplot.c
View File

@ -41,9 +41,6 @@ struct context {
uint8_t *old_sample; uint8_t *old_sample;
}; };
#define MAX_HEADER_LEN \
(1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10)))
static const char *gnuplot_header = "\ static const char *gnuplot_header = "\
# Sample data in space-separated columns format usable by gnuplot\n\ # Sample data in space-separated columns format usable by gnuplot\n\
#\n\ #\n\
@ -66,7 +63,7 @@ static int init(struct sr_output *o)
GVariant *gvar; GVariant *gvar;
uint64_t samplerate; uint64_t samplerate;
unsigned int i; unsigned int i;
int b, num_probes; int num_probes;
char *c, *frequency_s; char *c, *frequency_s;
char wbuf[1000], comment[128]; char wbuf[1000], comment[128];
time_t t; time_t t;
@ -91,12 +88,6 @@ static int init(struct sr_output *o)
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
if (!(ctx->header = g_try_malloc0(MAX_HEADER_LEN + 1))) {
sr_err("%s: ctx->header malloc failed", __func__);
g_free(ctx);
return SR_ERR_MALLOC;
}
o->internal = ctx; o->internal = ctx;
ctx->num_enabled_probes = 0; ctx->num_enabled_probes = 0;
for (l = o->sdi->probes; l; l = l->next) { for (l = o->sdi->probes; l; l = l->next) {
@ -114,7 +105,6 @@ static int init(struct sr_output *o)
samplerate = g_variant_get_uint64(gvar); samplerate = g_variant_get_uint64(gvar);
if (!(frequency_s = sr_samplerate_string(samplerate))) { if (!(frequency_s = sr_samplerate_string(samplerate))) {
sr_err("%s: sr_samplerate_string failed", __func__); sr_err("%s: sr_samplerate_string failed", __func__);
g_free(ctx->header);
g_free(ctx); g_free(ctx);
g_variant_unref(gvar); g_variant_unref(gvar);
return SR_ERR; return SR_ERR;
@ -137,24 +127,15 @@ static int init(struct sr_output *o)
if (!(frequency_s = sr_period_string(samplerate))) { if (!(frequency_s = sr_period_string(samplerate))) {
sr_err("%s: sr_period_string failed", __func__); sr_err("%s: sr_period_string failed", __func__);
g_free(ctx->header);
g_free(ctx); g_free(ctx);
return SR_ERR; return SR_ERR;
} }
t = time(NULL); t = time(NULL);
b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header, ctx->header = g_strdup_printf(gnuplot_header, PACKAGE_STRING,
PACKAGE_STRING, ctime(&t), comment, frequency_s, ctime(&t), comment, frequency_s, (char *)&wbuf);
(char *)&wbuf);
g_free(frequency_s); g_free(frequency_s);
if (b < 0) {
sr_err("%s: sprintf failed", __func__);
g_free(ctx->header);
g_free(ctx);
return SR_ERR;
}
if (!(ctx->old_sample = g_try_malloc0(ctx->unitsize))) { if (!(ctx->old_sample = g_try_malloc0(ctx->unitsize))) {
sr_err("%s: ctx->old_sample malloc failed", __func__); sr_err("%s: ctx->old_sample malloc failed", __func__);
g_free(ctx->header); g_free(ctx->header);