diff options
| author | David Robillard <d@drobilla.net> | 2018-07-13 21:04:54 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-04-13 19:15:32 +0200 |
| commit | 5de7dc6ab43b15d01937364218862dc174343b31 (patch) | |
| tree | da45850a950bc96c62cc18a270808046797e542c /src/writer.c | |
| parent | 9aa551a5bada683db9272937ab73ae43882cb978 (diff) | |
| download | serd-5de7dc6ab43b15d01937364218862dc174343b31.tar.gz serd-5de7dc6ab43b15d01937364218862dc174343b31.tar.bz2 serd-5de7dc6ab43b15d01937364218862dc174343b31.zip | |
Separate ByteSink from Writer
Diffstat (limited to 'src/writer.c')
| -rw-r--r-- | src/writer.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/writer.c b/src/writer.c index 4af3adf4..48167cc7 100644 --- a/src/writer.c +++ b/src/writer.c @@ -95,7 +95,8 @@ struct SerdWriterImpl { SerdNode* root_node; SerdURI root_uri; SerdStack anon_stack; - SerdByteSink* byte_sink; + SerdWriteFunc write_func; + void* stream; SerdErrorSink error_sink; void* error_handle; WriteContext context; @@ -160,7 +161,7 @@ ctx(SerdWriter* writer, const SerdField field) static inline size_t sink(const void* buf, size_t len, SerdWriter* writer) { - return serd_byte_sink_write(buf, 1, len, writer->byte_sink); + return writer->write_func(buf, 1, len, writer->stream); } // Write a single character, as an escape for single byte characters @@ -856,7 +857,6 @@ serd_writer_finish(SerdWriter* writer) if (ctx(writer, SERD_GRAPH)) { write_sep(writer, SEP_GRAPH_END); } - serd_byte_sink_flush(writer->byte_sink); free_context(writer); writer->indent = 0; writer->context = WRITE_CONTEXT_NULL; @@ -868,7 +868,7 @@ serd_writer_new(SerdWorld* world, SerdSyntax syntax, SerdStyleFlags style, SerdEnv* env, - SerdWriteFunc ssink, + SerdWriteFunc write_func, void* stream) { const WriteContext context = WRITE_CONTEXT_NULL; @@ -880,11 +880,11 @@ serd_writer_new(SerdWorld* world, writer->root_node = NULL; writer->root_uri = SERD_URI_NULL; writer->anon_stack = serd_stack_new(SERD_PAGE_SIZE); + writer->write_func = write_func; + writer->stream = stream; writer->context = context; writer->list_subj = NULL; writer->empty = true; - writer->byte_sink = serd_byte_sink_new( - ssink, stream, (style & SERD_STYLE_BULK) ? SERD_PAGE_SIZE : 1); writer->iface.handle = writer; writer->iface.base = (SerdBaseSink)serd_writer_set_base_uri; @@ -974,7 +974,6 @@ serd_writer_free(SerdWriter* writer) serd_writer_finish(writer); serd_stack_free(&writer->anon_stack); free(writer->bprefix); - serd_byte_sink_free(writer->byte_sink); serd_node_free(writer->root_node); free(writer); } |