diff options
Diffstat (limited to 'src/writer.c')
| -rw-r--r-- | src/writer.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/writer.c b/src/writer.c index 7cb28d0a..e19518e4 100644 --- a/src/writer.c +++ b/src/writer.c @@ -191,7 +191,7 @@ push_context(SerdWriter* const writer, const SerdNode* const p) { if (writer->anon_stack_size >= anon_stack_capacity) { - return SERD_ERR_OVERFLOW; + return SERD_BAD_STACK; } const WriteContext new_context = {type, @@ -258,10 +258,10 @@ sink(const void* buf, size_t len, SerdWriter* writer) char message[1024] = {0}; serd_system_strerror(errno, message, sizeof(message)); - w_err(writer, SERD_ERR_BAD_WRITE, "write error (%s)", message); + w_err(writer, SERD_BAD_WRITE, "write error (%s)", message); } else { w_err(writer, - SERD_ERR_BAD_WRITE, + SERD_BAD_WRITE, "unknown write error, %zu / %zu bytes written", written, len); @@ -274,7 +274,7 @@ sink(const void* buf, size_t len, SerdWriter* writer) SERD_WARN_UNUSED_RESULT static SerdStatus esink(const void* buf, size_t len, SerdWriter* writer) { - return sink(buf, len, writer) == len ? SERD_SUCCESS : SERD_ERR_BAD_WRITE; + return sink(buf, len, writer) == len ? SERD_SUCCESS : SERD_BAD_WRITE; } // Write a single character as a Unicode escape @@ -289,8 +289,7 @@ write_character(SerdWriter* writer, const uint32_t c = parse_utf8_char(utf8, size); switch (*size) { case 0: - w_err(writer, SERD_ERR_BAD_TEXT, "invalid UTF-8 start: %X", utf8[0]); - *st = SERD_ERR_BAD_TEXT; + *st = w_err(writer, SERD_BAD_TEXT, "invalid UTF-8 start: %X", utf8[0]); return 0; case 1: snprintf(escape, sizeof(escape), "\\u%04X", utf8[0]); @@ -349,7 +348,7 @@ write_uri(SerdWriter* writer, const char* utf8, size_t n_bytes, SerdStatus* st) const size_t n_bulk = sink(&utf8[i], j - i, writer); len += n_bulk; if (n_bulk != j - i) { - *st = SERD_ERR_BAD_WRITE; + *st = SERD_BAD_WRITE; return len; } @@ -384,7 +383,7 @@ ewrite_uri(SerdWriter* writer, const char* utf8, size_t n_bytes) SerdStatus st = SERD_SUCCESS; write_uri(writer, utf8, n_bytes, &st); - return (st == SERD_ERR_BAD_WRITE || !(writer->flags & SERD_WRITE_LAX)) + return (st == SERD_BAD_WRITE || !(writer->flags & SERD_WRITE_LAX)) ? st : SERD_SUCCESS; } @@ -862,7 +861,7 @@ write_uri_node(SerdWriter* const writer, if (!has_scheme && !supports_uriref(writer) && !serd_env_base_uri(writer->env)) { return w_err(writer, - SERD_ERR_BAD_ARG, + SERD_BAD_ARG, "syntax does not support URI reference <%s>", node_str); } @@ -1211,7 +1210,7 @@ serd_writer_write_statement(SerdWriter* const writer, ((flags & SERD_ANON_O) && (flags & SERD_LIST_O)) || // Nonsense ((flags & SERD_ANON_S) && (flags & SERD_TERSE_S)) || // Unsupported ((flags & SERD_ANON_O) && (flags & SERD_TERSE_O))) { // Unsupported - return SERD_ERR_BAD_ARG; + return SERD_BAD_ARG; } switch (writer->syntax) { @@ -1245,7 +1244,7 @@ serd_writer_end_anon(SerdWriter* writer, const SerdNode* node) if (writer->anon_stack_size == 0) { return w_err(writer, - SERD_ERR_BAD_CALL, + SERD_BAD_EVENT, "unexpected end of anonymous node `%s'", serd_node_string(node)); } @@ -1278,7 +1277,7 @@ serd_writer_on_event(SerdWriter* writer, const SerdEvent* event) return serd_writer_end_anon(writer, event->end.node); } - return SERD_ERR_BAD_ARG; + return SERD_BAD_ARG; } SerdStatus @@ -1361,7 +1360,7 @@ serd_writer_set_base_uri(SerdWriter* writer, const SerdNode* uri) assert(writer); if (uri->type != SERD_URI) { - return SERD_ERR_BAD_ARG; + return SERD_BAD_ARG; } SerdStatus st = SERD_SUCCESS; @@ -1405,7 +1404,7 @@ serd_writer_set_prefix(SerdWriter* writer, const SerdNode* uri) { if (name->type != SERD_LITERAL || uri->type != SERD_URI) { - return SERD_ERR_BAD_ARG; + return SERD_BAD_ARG; } SerdStatus st = SERD_SUCCESS; |