diff options
author | David Robillard <d@drobilla.net> | 2018-11-25 18:08:54 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-11-25 22:12:48 +0100 |
commit | 2a1a2522b23122e2428019489df9ddb5b0ec30ea (patch) | |
tree | a3edb59a31ca127f145cc0ca572a0d3eaa2f72e4 /src/reader.c | |
parent | 61f44d803f7b197c83547927ef86329d9a13c5d2 (diff) | |
download | serd-2a1a2522b23122e2428019489df9ddb5b0ec30ea.tar.gz serd-2a1a2522b23122e2428019489df9ddb5b0ec30ea.tar.bz2 serd-2a1a2522b23122e2428019489df9ddb5b0ec30ea.zip |
Remove reader status and handle errors more precisely
Diffstat (limited to 'src/reader.c')
-rw-r--r-- | src/reader.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/reader.c b/src/reader.c index e286fd4e..ace6ef7d 100644 --- a/src/reader.c +++ b/src/reader.c @@ -83,7 +83,6 @@ push_node_padded(SerdReader* reader, size_t maxlen, &reader->stack, sizeof(SerdNode) + maxlen + 1, sizeof(SerdNode)); if (!mem) { - reader->status = SERD_ERR_OVERFLOW; return NULL; } @@ -278,15 +277,15 @@ serd_reader_start_string(SerdReader* reader, static SerdStatus serd_reader_prepare(SerdReader* reader) { - reader->status = serd_byte_source_prepare(&reader->source); - if (reader->status == SERD_SUCCESS) { - reader->status = skip_bom(reader); - } else if (reader->status == SERD_FAILURE) { + SerdStatus st = serd_byte_source_prepare(&reader->source); + if (st == SERD_SUCCESS) { + st = skip_bom(reader); + } else if (st == SERD_FAILURE) { reader->source.eof = true; } else { - r_err(reader, reader->status, "read error: %s\n", strerror(errno)); + r_err(reader, st, "read error: %s\n", strerror(errno)); } - return reader->status; + return st; } SerdStatus |