aboutsummaryrefslogtreecommitdiffstats
path: root/src/reader.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2021-07-11 20:47:51 -0400
committerDavid Robillard <d@drobilla.net>2022-01-13 23:03:46 -0500
commit71c950bb749c3581ab389edfff9771cb06242e29 (patch)
treea1437913131978133e48b21078d900859ce30c43 /src/reader.c
parent30f3e6fc2c1e24c429d5d0b7100dc449ade6703f (diff)
downloadserd-71c950bb749c3581ab389edfff9771cb06242e29.tar.gz
serd-71c950bb749c3581ab389edfff9771cb06242e29.tar.bz2
serd-71c950bb749c3581ab389edfff9771cb06242e29.zip
Add SerdWorld for shared library state
Diffstat (limited to 'src/reader.c')
-rw-r--r--src/reader.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/reader.c b/src/reader.c
index 354ff478..c35f5fbc 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -38,7 +38,7 @@ r_err(SerdReader* const reader, const SerdStatus st, const char* const fmt, ...)
va_start(args, fmt);
const Cursor* const cur = &reader->source.cur;
const SerdError e = {st, cur->filename, cur->line, cur->col, fmt, &args};
- serd_error(reader->error_func, reader->error_handle, &e);
+ serd_error(reader->world, &e);
va_end(args);
return st;
}
@@ -160,7 +160,8 @@ serd_reader_read_document(SerdReader* const reader)
}
SerdReader*
-serd_reader_new(const SerdSyntax syntax,
+serd_reader_new(SerdWorld* const world,
+ const SerdSyntax syntax,
const SerdSink* const sink,
const size_t stack_size)
{
@@ -170,6 +171,7 @@ serd_reader_new(const SerdSyntax syntax,
SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader));
+ me->world = world;
me->sink = sink;
me->default_graph = NULL;
me->stack = serd_stack_new(stack_size);
@@ -199,15 +201,6 @@ serd_reader_set_strict(SerdReader* const reader, const bool strict)
}
void
-serd_reader_set_error_sink(SerdReader* const reader,
- const SerdErrorFunc error_func,
- void* const error_handle)
-{
- reader->error_func = error_func;
- reader->error_handle = error_handle;
-}
-
-void
serd_reader_free(SerdReader* const reader)
{
if (!reader) {