diff options
author | David Robillard <d@drobilla.net> | 2018-12-29 17:36:15 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2020-10-27 13:13:58 +0100 |
commit | 94efab288a499e9e5f3f3ef5c9daddab616c174b (patch) | |
tree | a9902616544be73b253d5e92f23e83ad8e1990f4 /src/n3.c | |
parent | 47d1df0f22cc8330595b7c0e19762aeb28ac80c6 (diff) | |
download | serd-94efab288a499e9e5f3f3ef5c9daddab616c174b.tar.gz serd-94efab288a499e9e5f3f3ef5c9daddab616c174b.tar.bz2 serd-94efab288a499e9e5f3f3ef5c9daddab616c174b.zip |
Use public sink interface in reader
Diffstat (limited to 'src/n3.c')
-rw-r--r-- | src/n3.c | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -18,7 +18,6 @@ #include "node.h" #include "reader.h" #include "serd_internal.h" -#include "sink.h" #include "stack.h" #include "string_utils.h" #include "uri_utils.h" @@ -1012,8 +1011,8 @@ read_anon(SerdReader* reader, ReadContext ctx, bool subject, SerdNode** dest) *ctx.flags = old_flags; } - if (reader->sink->end && (!subject || !empty)) { - reader->sink->end(reader->sink->handle, *dest); + if (!subject || !empty) { + serd_sink_write_end(reader->sink, *dest); } return (eat_byte_check(reader, ']') == ']') ? SERD_SUCCESS @@ -1324,10 +1323,9 @@ read_base(SerdReader* reader, bool sparql, bool token) SerdNode* uri = NULL; TRY(st, read_IRIREF(reader, &uri)); - if (reader->sink->base) { - serd_node_zero_pad(uri); - TRY(st, reader->sink->base(reader->sink->handle, uri)); - } + + serd_node_zero_pad(uri); + TRY(st, serd_sink_write_base(reader->sink, uri)); read_ws_star(reader); if (!sparql) { @@ -1363,11 +1361,10 @@ read_prefixID(SerdReader* reader, bool sparql, bool token) SerdNode* uri = NULL; TRY(st, read_IRIREF(reader, &uri)); - if (reader->sink->prefix) { - serd_node_zero_pad(name); - serd_node_zero_pad(uri); - st = reader->sink->prefix(reader->sink->handle, name, uri); - } + serd_node_zero_pad(name); + serd_node_zero_pad(uri); + st = serd_sink_write_prefix(reader->sink, name, uri); + if (!sparql) { read_ws_star(reader); st = eat_byte_check(reader, '.') ? SERD_SUCCESS : SERD_ERR_BAD_SYNTAX; |