aboutsummaryrefslogtreecommitdiffstats
path: root/src/writer.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-11-26 22:14:39 +0100
committerDavid Robillard <d@drobilla.net>2020-10-27 13:13:58 +0100
commita08759985ce25cda9b340a85eef30f572a8ceacc (patch)
treeec3f979605792b69c4c2fc7895f5dc917af39e7e /src/writer.c
parent704305ddadae5e8737cf775bcc7fb1db3e91a1ce (diff)
downloadserd-a08759985ce25cda9b340a85eef30f572a8ceacc.tar.gz
serd-a08759985ce25cda9b340a85eef30f572a8ceacc.tar.bz2
serd-a08759985ce25cda9b340a85eef30f572a8ceacc.zip
Add extensible logging API
Diffstat (limited to 'src/writer.c')
-rw-r--r--src/writer.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/writer.c b/src/writer.c
index d84600e1..891f2413 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -114,8 +114,8 @@ struct SerdWriterImpl {
SerdStack anon_stack;
SerdWriteFunc write_func;
void* stream;
- SerdErrorSink error_sink;
- void* msg_handle;
+ SerdLogFunc log_func;
+ void* log_handle;
WriteContext context;
unsigned indent;
char* bprefix;
@@ -212,8 +212,9 @@ write_character(SerdWriter* writer, const uint8_t* utf8, size_t* size)
const uint32_t c = parse_utf8_char(utf8, size);
switch (*size) {
case 0:
- serd_world_errorf(
- writer->world, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", utf8[0]);
+ SERD_LOG_ERRORF(writer->world, SERD_ERR_BAD_ARG,
+ "invalid UTF-8: %X\n",
+ utf8[0]);
return sink(replacement_char, sizeof(replacement_char), writer);
case 1:
snprintf(escape, sizeof(escape), "\\u%04X", utf8[0]);
@@ -621,10 +622,9 @@ write_curie(SerdWriter* const writer,
case SERD_NQUADS:
if ((st = serd_env_expand_in_place(
writer->env, node, &prefix, &suffix))) {
- serd_world_errorf(writer->world,
- st,
- "undefined namespace prefix `%s'\n",
- serd_node_string(node));
+ SERD_LOG_ERRORF(writer->world, st,
+ "undefined namespace prefix `%s'\n",
+ serd_node_string(node));
return false;
}
sink("<", 1, writer);
@@ -901,8 +901,8 @@ serd_writer_end_anon(SerdWriter* writer,
if (writer->syntax == SERD_NTRIPLES || writer->syntax == SERD_NQUADS) {
return SERD_SUCCESS;
} else if (serd_stack_is_empty(&writer->anon_stack)) {
- return serd_world_errorf(writer->world, SERD_ERR_UNKNOWN,
- "unexpected end of anonymous node\n");
+ return SERD_LOG_ERROR(writer->world, SERD_ERR_UNKNOWN,
+ "unexpected end of anonymous node\n");
}
write_sep(writer, SEP_ANON_END);