From b1e79af3188b1caf2051fca20fba6464e4ce62d4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 29 Dec 2018 17:36:15 -0500 Subject: Add Env to Sink This isn't technically necessary for any sink, but is a pattern common to every sink implementation in serd, so having it here reduces boilerplate and parameters in user code. --- src/reader.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/reader.c') diff --git a/src/reader.c b/src/reader.c index 778616d2..44117a20 100644 --- a/src/reader.c +++ b/src/reader.c @@ -20,7 +20,6 @@ #include "node.h" #include "serd/serd.h" #include "serd_internal.h" -#include "sink.h" #include "stack.h" #include "statement.h" #include "system.h" @@ -121,9 +120,6 @@ SerdStatus emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o) { SerdNode* graph = ctx.graph; - if (!reader->sink->statement) { - return SERD_SUCCESS; - } /* Zero the pad of the object node on the top of the stack. Lower nodes (subject and predicate) were already zeroed by subsequent pushes. */ @@ -134,8 +130,9 @@ emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o) &reader->source.cur }; - const SerdStatus st = reader->sink->statement( - reader->sink->handle, *ctx.flags, &statement); + const SerdStatus st = serd_sink_write_statement( + reader->sink, *ctx.flags, &statement); + *ctx.flags = 0; return st; } -- cgit v1.2.1