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

output/csv: Drop last separators as needed.

This commit is contained in:
Bert Vermeulen 2014-01-23 23:11:34 +01:00
parent ee38c8ba3e
commit e36aae989c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
output/csv.c
View File

@ -98,7 +98,7 @@ static int init(struct sr_output *o)
ctx->samplerate); ctx->samplerate);
/* Columns / channels */ /* Columns / channels */
g_string_append_printf(ctx->header, "; Channels (%d/%d): ", g_string_append_printf(ctx->header, "; Channels (%d/%d):",
ctx->num_enabled_probes, num_probes); ctx->num_enabled_probes, num_probes);
for (l = o->sdi->probes; l; l = l->next) { for (l = o->sdi->probes; l; l = l->next) {
probe = l->data; probe = l->data;
@ -106,8 +106,11 @@ static int init(struct sr_output *o)
continue; continue;
if (!probe->enabled) if (!probe->enabled)
continue; continue;
g_string_append_printf(ctx->header, "%s, ", probe->name); g_string_append_printf(ctx->header, " %s,", probe->name);
} }
if (o->sdi->probes)
/* Drop last separator. */
g_string_truncate(ctx->header, ctx->header->len - 1);
g_string_append_printf(ctx->header, "\n"); g_string_append_printf(ctx->header, "\n");
return SR_OK; return SR_OK;
@ -150,7 +153,7 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
g_string_append_c(*out, c ? '1' : '0'); g_string_append_c(*out, c ? '1' : '0');
g_string_append_c(*out, ctx->separator); g_string_append_c(*out, ctx->separator);
} }
if (i && j) { if (j) {
/* Drop last separator. */ /* Drop last separator. */
g_string_truncate(*out, (*out)->len - 1); g_string_truncate(*out, (*out)->len - 1);
} }