diff options
| author | David Robillard <d@drobilla.net> | 2018-05-10 19:29:22 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-10-27 13:13:58 +0100 |
| commit | 79bd5c789631ea51071564813046e34b304e1bc7 (patch) | |
| tree | 8c58ef6692972eb41d0894a6267d3868217cd2a4 /src/reader.c | |
| parent | ce6fbad56fb6970fe507186d6560ad4fac981d74 (diff) | |
| download | serd-79bd5c789631ea51071564813046e34b304e1bc7.tar.gz serd-79bd5c789631ea51071564813046e34b304e1bc7.tar.bz2 serd-79bd5c789631ea51071564813046e34b304e1bc7.zip | |
Add SerdSink interface and hide individual function implementations
Diffstat (limited to 'src/reader.c')
| -rw-r--r-- | src/reader.c | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/src/reader.c b/src/reader.c index e58982c0..0f097a02 100644 --- a/src/reader.c +++ b/src/reader.c @@ -124,14 +124,14 @@ emit_statement(SerdReader* reader, ReadContext ctx, Ref o) } const SerdStatus st = - !reader->statement_sink + !reader->sink->statement ? SERD_SUCCESS - : reader->statement_sink(reader->handle, - *ctx.flags, - graph, - deref(reader, ctx.subject), - deref(reader, ctx.predicate), - deref(reader, o)); + : reader->sink->statement(reader->sink->handle, + *ctx.flags, + graph, + deref(reader, ctx.subject), + deref(reader, ctx.predicate), + deref(reader, o)); *ctx.flags &= SERD_ANON_CONT|SERD_LIST_CONT; // Preserve only cont flags return st; @@ -158,26 +158,16 @@ serd_reader_read_document(SerdReader* reader) } SerdReader* -serd_reader_new(SerdSyntax syntax, - void* handle, - void (*free_handle)(void*), - SerdBaseSink base_sink, - SerdPrefixSink prefix_sink, - SerdStatementSink statement_sink, - SerdEndSink end_sink) +serd_reader_new(SerdSyntax syntax, const SerdSink* sink) { - SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader)); - me->handle = handle; - me->free_handle = free_handle; - me->base_sink = base_sink; - me->prefix_sink = prefix_sink; - me->statement_sink = statement_sink; - me->end_sink = end_sink; - me->default_graph = NULL; - me->stack = serd_stack_new(SERD_PAGE_SIZE); - me->syntax = syntax; - me->next_id = 1; - me->strict = true; + SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader)); + + me->sink = sink; + me->default_graph = NULL; + me->stack = serd_stack_new(SERD_PAGE_SIZE); + me->syntax = syntax; + me->next_id = 1; + me->strict = true; me->rdf_first = push_node(me, SERD_URI, NS_RDF "first", 48); me->rdf_rest = push_node(me, SERD_URI, NS_RDF "rest", 47); @@ -218,18 +208,9 @@ serd_reader_free(SerdReader* reader) #endif free(reader->stack.buf); free(reader->bprefix); - if (reader->free_handle) { - reader->free_handle(reader->handle); - } free(reader); } -void* -serd_reader_handle(const SerdReader* reader) -{ - return reader->handle; -} - void serd_reader_add_blank_prefix(SerdReader* reader, const char* prefix) |