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

input: vcd: avoid needless copying 

Current code moves the identifier string one byte to the front to
overwrite the bit value, so 'tokens[i]' is a string to compare against
the desired value. This copying is unnecessary, just pass a properly
setup pointer.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2016-01-09 08:17:57 +01:00 committed by Uwe Hermann
parent 76bc28c3f1
commit a66175c2b1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/vcd.c
View File

@ -415,6 +415,8 @@ static void parse_contents(const struct sr_input *in, char *data)
/* Process next token */ /* Process next token */
continue; continue;
} else if (strchr("01xXzZ", tokens[i][0]) != NULL) { } else if (strchr("01xXzZ", tokens[i][0]) != NULL) {
char *identifier;
/* A new 1-bit sample value */ /* A new 1-bit sample value */
bit = (tokens[i][0] == '1'); bit = (tokens[i][0] == '1');
@ -427,15 +429,14 @@ static void parse_contents(const struct sr_input *in, char *data)
sr_dbg("Identifier missing!"); sr_dbg("Identifier missing!");
break; break;
} }
identifier = tokens[i];
} else { } else {
for (j = 1; tokens[i][j]; j++) identifier = tokens[i] + 1;
tokens[i][j - 1] = tokens[i][j];
tokens[i][j - 1] = '\0';
} }
for (j = 0, l = inc->channels; j < inc->channelcount && l; j++, l = l->next) { for (j = 0, l = inc->channels; j < inc->channelcount && l; j++, l = l->next) {
vcd_ch = l->data; vcd_ch = l->data;
if (g_strcmp0(tokens[i], vcd_ch->identifier) == 0) { if (g_strcmp0(identifier, vcd_ch->identifier) == 0) {
/* Found our channel */ /* Found our channel */
size_t byte_idx = (j / 8); size_t byte_idx = (j / 8);
size_t bit_idx = j - 8 * byte_idx; size_t bit_idx = j - 8 * byte_idx;
@ -447,7 +448,7 @@ static void parse_contents(const struct sr_input *in, char *data)
} }
} }
if (j == inc->channelcount) if (j == inc->channelcount)
sr_dbg("Did not find channel for identifier '%s'.", tokens[i]); sr_dbg("Did not find channel for identifier '%s'.", identifier);
} else { } else {
sr_warn("Skipping unknown token '%s'.", tokens[i]); sr_warn("Skipping unknown token '%s'.", tokens[i]);
} }