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

input/csv: Improve readability (bool expr vs assign, nested arrays) 

Move variable assignments out of boolean condition checks. Factor out
repeated access to nested arrays. This shall improve readability.
This commit is contained in:
Gerhard Sittig 2017-06-05 13:02:31 +02:00 committed by Uwe Hermann
parent b4698e4d61
commit df0db9fdda
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/input/csv.c
View File

@ -313,20 +313,22 @@ static char **parse_line(char *buf, struct context *inc, int max_columns)
static int parse_multi_columns(char **columns, struct context *inc) static int parse_multi_columns(char **columns, struct context *inc)
{ {
gsize i; gsize i;
char *column;
/* Clear buffer in order to set bits only. */ /* Clear buffer in order to set bits only. */
memset(inc->sample_buffer, 0, (inc->num_channels + 7) >> 3); memset(inc->sample_buffer, 0, (inc->num_channels + 7) >> 3);
for (i = 0; i < inc->num_channels; i++) { for (i = 0; i < inc->num_channels; i++) {
if (columns[i][0] == '1') { column = columns[i];
if (column[0] == '1') {
inc->sample_buffer[i / 8] |= (1 << (i % 8)); inc->sample_buffer[i / 8] |= (1 << (i % 8));
} else if (!strlen(columns[i])) { } else if (!strlen(column)) {
sr_err("Column %zu in line %zu is empty.", sr_err("Column %zu in line %zu is empty.",
inc->first_channel + i, inc->line_number); inc->first_channel + i, inc->line_number);
return SR_ERR; return SR_ERR;
} else if (columns[i][0] != '0') { } else if (column[0] != '0') {
sr_err("Invalid value '%s' in column %zu in line %zu.", sr_err("Invalid value '%s' in column %zu in line %zu.",
columns[i], inc->first_channel + i, column, inc->first_channel + i,
inc->line_number); inc->line_number);
return SR_ERR; return SR_ERR;
} }
@ -371,7 +373,8 @@ static int send_samples(const struct sr_dev_inst *sdi, uint8_t *buffer,
logic.data = buffer; logic.data = buffer;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if ((res = sr_session_send(sdi, &packet)) != SR_OK) res = sr_session_send(sdi, &packet);
if (res != SR_OK)
return res; return res;
} }
@ -466,7 +469,7 @@ static int initial_parse(const struct sr_input *in, GString *buf)
unsigned int num_columns, i; unsigned int num_columns, i;
size_t line_number, l; size_t line_number, l;
int ret; int ret;
char **lines, **columns; char **lines, *line, **columns, *column;
ret = SR_OK; ret = SR_OK;
inc = in->priv; inc = in->priv;
@ -476,16 +479,17 @@ static int initial_parse(const struct sr_input *in, GString *buf)
lines = g_strsplit_set(buf->str, "\r\n", 0); lines = g_strsplit_set(buf->str, "\r\n", 0);
for (l = 0; lines[l]; l++) { for (l = 0; lines[l]; l++) {
line_number++; line_number++;
line = lines[l];
if (inc->start_line > line_number) { if (inc->start_line > line_number) {
sr_spew("Line %zu skipped.", line_number); sr_spew("Line %zu skipped.", line_number);
continue; continue;
} }
if (lines[l][0] == '\0') { if (line[0] == '\0') {
sr_spew("Blank line %zu skipped.", line_number); sr_spew("Blank line %zu skipped.", line_number);
continue; continue;
} }
strip_comment(lines[l], inc->comment); strip_comment(line, inc->comment);
if (lines[l][0] == '\0') { if (line[0] == '\0') {
sr_spew("Comment-only line %zu skipped.", line_number); sr_spew("Comment-only line %zu skipped.", line_number);
continue; continue;
} }
@ -503,7 +507,8 @@ static int initial_parse(const struct sr_input *in, GString *buf)
* In order to determine the number of columns parse the current line * In order to determine the number of columns parse the current line
* without limiting the number of columns. * without limiting the number of columns.
*/ */
if (!(columns = parse_line(lines[l], inc, -1))) { columns = parse_line(line, inc, -1);
if (!columns) {
sr_err("Error while parsing line %zu.", line_number); sr_err("Error while parsing line %zu.", line_number);
ret = SR_ERR; ret = SR_ERR;
goto out; goto out;
@ -543,8 +548,9 @@ static int initial_parse(const struct sr_input *in, GString *buf)
channel_name = g_string_sized_new(64); channel_name = g_string_sized_new(64);
for (i = 0; i < inc->num_channels; i++) { for (i = 0; i < inc->num_channels; i++) {
if (inc->header && inc->multi_column_mode && columns[i][0] != '\0') column = columns[i];
g_string_assign(channel_name, columns[i]); if (inc->header && inc->multi_column_mode && column[0] != '\0')
g_string_assign(channel_name, column);
else else
g_string_printf(channel_name, "%u", i); g_string_printf(channel_name, "%u", i);
sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name->str); sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name->str);
@ -576,11 +582,13 @@ static int initial_receive(const struct sr_input *in)
inc = in->priv; inc = in->priv;
if (!(termination = get_line_termination(in->buf))) termination = get_line_termination(in->buf);
if (!termination)
/* Don't have a full line yet. */ /* Don't have a full line yet. */
return SR_ERR_NA; return SR_ERR_NA;
if (!(p = g_strrstr_len(in->buf->str, in->buf->len, termination))) p = g_strrstr_len(in->buf->str, in->buf->len, termination);
if (!p)
/* Don't have a full line yet. */ /* Don't have a full line yet. */
return SR_ERR_NA; return SR_ERR_NA;
len = p - in->buf->str - 1; len = p - in->buf->str - 1;
@ -608,7 +616,7 @@ static int process_buffer(struct sr_input *in)
gsize num_columns; gsize num_columns;
uint64_t samplerate; uint64_t samplerate;
int max_columns, ret, l; int max_columns, ret, l;
char *p, **lines, **columns; char *p, **lines, *line, **columns;
inc = in->priv; inc = in->priv;
if (!inc->started) { if (!inc->started) {
@ -628,7 +636,8 @@ static int process_buffer(struct sr_input *in)
inc->started = TRUE; inc->started = TRUE;
} }
if (!(p = g_strrstr_len(in->buf->str, in->buf->len, inc->termination))) p = g_strrstr_len(in->buf->str, in->buf->len, inc->termination);
if (!p)
/* Don't have a full line. */ /* Don't have a full line. */
return SR_ERR; return SR_ERR;
@ -645,14 +654,15 @@ static int process_buffer(struct sr_input *in)
lines = g_strsplit_set(in->buf->str, "\r\n", 0); lines = g_strsplit_set(in->buf->str, "\r\n", 0);
for (l = 0; lines[l]; l++) { for (l = 0; lines[l]; l++) {
inc->line_number++; inc->line_number++;
if (lines[l][0] == '\0') { line = lines[l];
if (line[0] == '\0') {
sr_spew("Blank line %zu skipped.", inc->line_number); sr_spew("Blank line %zu skipped.", inc->line_number);
continue; continue;
} }
/* Remove trailing comment. */ /* Remove trailing comment. */
strip_comment(lines[l], inc->comment); strip_comment(line, inc->comment);
if (lines[l][0] == '\0') { if (line[0] == '\0') {
sr_spew("Comment-only line %zu skipped.", inc->line_number); sr_spew("Comment-only line %zu skipped.", inc->line_number);
continue; continue;
} }
@ -664,7 +674,8 @@ static int process_buffer(struct sr_input *in)
continue; continue;
} }
if (!(columns = parse_line(lines[l], inc, max_columns))) { columns = parse_line(line, inc, max_columns);
if (!columns) {
sr_err("Error while parsing line %zu.", inc->line_number); sr_err("Error while parsing line %zu.", inc->line_number);
return SR_ERR; return SR_ERR;
} }
@ -719,7 +730,8 @@ static int receive(struct sr_input *in, GString *buf)
inc = in->priv; inc = in->priv;
if (!inc->termination) { if (!inc->termination) {
if ((ret = initial_receive(in)) == SR_ERR_NA) ret = initial_receive(in);
if (ret == SR_ERR_NA)
/* Not enough data yet. */ /* Not enough data yet. */
return SR_OK; return SR_OK;
else if (ret != SR_OK) else if (ret != SR_OK)