aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/serdi.c17
-rw-r--r--src/writer.c13
2 files changed, 18 insertions, 12 deletions
diff --git a/src/serdi.c b/src/serdi.c
index 27ffbe71..b066b265 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -208,8 +208,7 @@ main(int argc, char** argv)
}
const SerdWriterFlags writer_flags =
- ((ascii ? SERD_WRITE_ASCII : 0) | //
- (bulk_write ? SERD_WRITE_BULK : 0) | //
+ ((ascii ? SERD_WRITE_ASCII : 0) | //
(full_uris ? (SERD_WRITE_UNQUALIFIED | SERD_WRITE_UNRESOLVED) : 0));
SerdNode* base = NULL;
@@ -223,8 +222,16 @@ main(int argc, char** argv)
SerdWorld* const world = serd_world_new();
SerdEnv* const env = serd_env_new(serd_node_string_view(base));
- SerdWriter* const writer = serd_writer_new(
- world, output_syntax, writer_flags, env, (SerdWriteFunc)fwrite, out_fd);
+ SerdByteSink* const byte_sink =
+ serd_byte_sink_new((SerdWriteFunc)fwrite, out_fd, bulk_write ? 4096u : 1u);
+
+ SerdWriter* const writer =
+ serd_writer_new(world,
+ output_syntax,
+ writer_flags,
+ env,
+ (SerdWriteFunc)serd_byte_sink_write,
+ byte_sink);
SerdReader* const reader =
serd_reader_new(world, input_syntax, serd_writer_sink(writer), stack_size);
@@ -263,9 +270,9 @@ main(int argc, char** argv)
serd_reader_finish(reader);
serd_reader_free(reader);
- serd_writer_finish(writer);
serd_writer_free(writer);
serd_node_free(input_name);
+ serd_byte_sink_free(byte_sink);
serd_env_free(env);
serd_node_free(base);
serd_world_free(world);
diff --git a/src/writer.c b/src/writer.c
index a522e0fb..0fabb7af 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -92,7 +92,8 @@ struct SerdWriterImpl {
SerdNode* root_node;
SerdURIView root_uri;
SerdStack anon_stack;
- SerdByteSink* byte_sink;
+ SerdWriteFunc write_func;
+ void* stream;
SerdErrorFunc error_func;
void* error_handle;
WriteContext context;
@@ -156,7 +157,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
@@ -964,7 +965,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;
@@ -976,7 +976,7 @@ serd_writer_new(SerdWorld* world,
SerdSyntax syntax,
SerdWriterFlags flags,
SerdEnv* env,
- SerdWriteFunc ssink,
+ SerdWriteFunc write_func,
void* stream)
{
const WriteContext context = WRITE_CONTEXT_NULL;
@@ -989,11 +989,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, (flags & SERD_WRITE_BULK) ? SERD_PAGE_SIZE : 1);
writer->iface.handle = writer;
writer->iface.on_event = (SerdEventFunc)serd_writer_on_event;
@@ -1091,7 +1091,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);
}