#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#define LOG_PREFIX "input/csv"
res = SR_ERR;
- switch(inc->format) {
+ switch (inc->format) {
case FORMAT_BIN:
res = parse_binstr(column, inc);
break;
struct context *inc;
const char *s;
- in->sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
+ in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
in->priv = inc = g_malloc0(sizeof(struct context));
inc->single_column = g_variant_get_int32(g_hash_table_lookup(options, "single-column"));
return SR_OK;
}
-static char *get_line_termination(GString *buf)
+static const char *get_line_termination(GString *buf)
{
- char *term;
+ const char *term;
term = NULL;
if (g_strstr_len(buf->str, buf->len, "\r\n"))
static int initial_parse(const struct sr_input *in, GString *buf)
{
struct context *inc;
- struct sr_channel *ch;
GString *channel_name;
gsize num_columns, l, i;
unsigned int line_number;
}
if (!lines[l]) {
/* Not enough data for a proper line yet. */
- ret = SR_OK_CONTINUE;
+ ret = SR_ERR_NA;
goto out;
}
if (inc->header && inc->multi_column_mode && strlen(columns[i]))
g_string_assign(channel_name, columns[i]);
else
- g_string_printf(channel_name, "%lu", i);
- ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name->str);
- in->sdi->channels = g_slist_append(in->sdi->channels, ch);
+ g_string_printf(channel_name, "%zu", i);
+ sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name->str);
}
g_string_free(channel_name, TRUE);
struct context *inc;
GString *new_buf;
int len, ret;
- char *termination, *p;
+ char *p;
+ const char *termination;
inc = in->priv;
else
max_columns = 1;
+ ret = SR_OK;
lines = g_strsplit_set(in->buf->str, "\r\n", 0);
for (l = 0; lines[l]; l++) {
inc->line_number++;
continue;
}
+ /* Skip the header line, its content was used as the channel names. */
+ if (inc->header) {
+ sr_spew("Header line %zu skipped.", inc->line_number);
+ inc->header = FALSE;
+ continue;
+ }
+
if (!(columns = parse_line(lines[l], inc, max_columns))) {
sr_err("Error while parsing line %zu.", inc->line_number);
return SR_ERR;
return ret;
}
-static int cleanup(struct sr_input *in)
+static void cleanup(struct sr_input *in)
{
struct context *inc;
if (inc->comment)
g_string_free(inc->comment, TRUE);
- if (inc->termination)
- g_free(inc->termination);
-
- if (inc->sample_buffer)
- g_free(inc->sample_buffer);
-
- return SR_OK;
+ g_free(inc->termination);
+ g_free(inc->sample_buffer);
}
static struct sr_option options[] = {
.id = "csv",
.name = "CSV",
.desc = "Comma-separated values",
+ .exts = (const char*[]){"csv", NULL},
.metadata = { SR_INPUT_META_MIMETYPE },
.options = get_options,
.format_match = format_match,