From bd24b8f6d558bafbbb16d9490ebe3478dbf130bd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 9 Sep 2021 13:57:43 -0400 Subject: Use more human-readable status codes --- src/reader.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/reader.c') diff --git a/src/reader.c b/src/reader.c index d051c34a..985a9fd2 100644 --- a/src/reader.c +++ b/src/reader.c @@ -90,9 +90,9 @@ tolerate_status(const SerdReader* const reader, const SerdStatus status) return true; } - if (status == SERD_ERR_INTERNAL || status == SERD_ERR_OVERFLOW || - status == SERD_ERR_BAD_WRITE || status == SERD_ERR_NO_DATA || - status == SERD_ERR_BAD_CALL || status == SERD_ERR_BAD_CURSOR) { + if (status == SERD_BAD_STACK || status == SERD_BAD_WRITE || + status == SERD_NO_DATA || status == SERD_BAD_CALL || + status == SERD_BAD_CURSOR) { return false; } @@ -161,7 +161,7 @@ emit_statement_at(SerdReader* const reader, SerdCaret* const caret) { if (reader->stack.size + (2 * sizeof(SerdNode)) > reader->stack.buf_size) { - return SERD_ERR_OVERFLOW; + return SERD_BAD_STACK; } /* Zero the pad of the object node on the top of the stack. Lower nodes @@ -198,7 +198,7 @@ serd_reader_read_document(SerdReader* const reader) assert(reader); if (!reader->source) { - return SERD_ERR_BAD_CALL; + return SERD_BAD_CALL; } if (!(reader->flags & SERD_READ_GLOBAL)) { @@ -301,8 +301,8 @@ skip_bom(SerdReader* const me) serd_byte_source_advance(me->source) || serd_byte_source_peek(me->source) != 0xBF || serd_byte_source_advance(me->source)) { - r_err(me, SERD_ERR_BAD_SYNTAX, "corrupt byte order mark"); - return SERD_ERR_BAD_SYNTAX; + r_err(me, SERD_BAD_SYNTAX, "corrupt byte order mark"); + return SERD_BAD_SYNTAX; } } @@ -322,7 +322,7 @@ serd_reader_start(SerdReader* const reader, reader->source = serd_byte_source_new_input(input, input_name, block_size); - return reader->source ? SERD_SUCCESS : SERD_ERR_BAD_ARG; + return reader->source ? SERD_SUCCESS : SERD_BAD_ARG; } static SerdStatus @@ -344,7 +344,7 @@ serd_reader_read_chunk(SerdReader* const reader) SerdStatus st = SERD_SUCCESS; if (!reader->source) { - return SERD_ERR_BAD_CALL; + return SERD_BAD_CALL; } if (!reader->source->prepared) { -- cgit v1.2.1