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

proper fix for output_text corner cases 

limit probe names to 32 chars
This commit is contained in:
Bert Vermeulen 2010-12-29 01:22:58 +01:00
parent e6ac9ac808
commit 339729131d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
output/output_text.c
View File

@ -69,6 +69,7 @@ static void flush_linebufs(struct context *ctx, char *outbuf)
ctx->mark_trigger + (ctx->mark_trigger / 8), ""); ctx->mark_trigger + (ctx->mark_trigger / 8), "");
memset(ctx->linebuf, 0, i * ctx->linebuf_len); memset(ctx->linebuf, 0, i * ctx->linebuf_len);
} }
static int init(struct output *o, int default_spl) static int init(struct output *o, int default_spl)
@ -180,12 +181,13 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
{ {
struct context *ctx; struct context *ctx;
unsigned int outsize, offset, p; unsigned int outsize, offset, p;
int max_linelen;
uint64_t sample; uint64_t sample;
char *outbuf; char *outbuf;
ctx = o->internal; ctx = o->internal;
outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + ctx->samples_per_line / 8;
ctx->samples_per_line + 4096; outsize = length_in / ctx->unitsize * ctx->num_enabled_probes / ctx->samples_per_line * max_linelen + 512;
if (!(outbuf = calloc(1, outsize + 1))) if (!(outbuf = calloc(1, outsize + 1)))
return SIGROK_ERR_MALLOC; return SIGROK_ERR_MALLOC;
@ -248,12 +250,13 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
{ {
struct context *ctx; struct context *ctx;
unsigned int outsize, offset, p; unsigned int outsize, offset, p;
int max_linelen;
uint64_t sample; uint64_t sample;
char *outbuf; char *outbuf;
ctx = o->internal; ctx = o->internal;
outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + ctx->samples_per_line / 2;
ctx->samples_per_line + 4096; outsize = length_in / ctx->unitsize * ctx->num_enabled_probes / ctx->samples_per_line * max_linelen + 512;
if (!(outbuf = calloc(1, outsize + 1))) if (!(outbuf = calloc(1, outsize + 1)))
return SIGROK_ERR_MALLOC; return SIGROK_ERR_MALLOC;

1
sigrok.h
View File

@ -210,6 +210,7 @@ struct device {
struct datastore *datastore; struct datastore *datastore;
}; };
#define MAX_PROBENAME_LEN 32
struct probe { struct probe {
int index; int index;
gboolean enabled; gboolean enabled;