WIP: Make Writer always write to a ByteSink

2 files changed, 21 insertions, 12 deletions

diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c
index a3e99fa4..a4f57a0f 100644
--- a/test/test_reader_writer.c
+++ b/test/test_reader_writer.c
@@ -152,8 +152,11 @@ test_strict_write(void)
   const char* path  = "serd_strict_write_test.ttl";
   FILE*       fd    = fopen(path, "wb");
   SerdEnv*    env   = serd_env_new(SERD_EMPTY_STRING());
-  SerdWriter* writer =
-    serd_writer_new(world, SERD_TURTLE, 0, env, (SerdWriteFunc)fwrite, fd);
+
+  SerdByteSink* byte_sink =
+    serd_byte_sink_new_function((SerdWriteFunc)fwrite, fd, 1);
+
+  SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, byte_sink);
 
   assert(fd);
   assert(writer);
@@ -175,6 +178,7 @@ test_strict_write(void)
   serd_node_free(p);
 
   serd_writer_free(writer);
+  serd_byte_sink_free(byte_sink);
   serd_env_free(env);
   fclose(fd);
   serd_world_free(world);
@@ -218,8 +222,12 @@ test_writer(const char* const path)
 
   SerdWorld* world = serd_world_new();
 
-  SerdWriter* writer = serd_writer_new(
-    world, SERD_TURTLE, SERD_WRITE_LAX, env, (SerdWriteFunc)fwrite, fd);
+  SerdByteSink* byte_sink =
+    serd_byte_sink_new_function((SerdWriteFunc)fwrite, fd, 1);
+
+  SerdWriter* writer =
+    serd_writer_new(world, SERD_TURTLE, SERD_WRITE_LAX, env, byte_sink);
+
   assert(writer);
 
   serd_writer_chop_blank_prefix(writer, "tmp");
@@ -280,6 +288,7 @@ test_writer(const char* const path)
   serd_node_free(hello);
 
   serd_writer_free(writer);
+  serd_byte_sink_free(byte_sink);
 
   serd_node_free(lit);
   serd_node_free(o);
@@ -287,12 +296,10 @@ test_writer(const char* const path)
   serd_node_free(l);
 
   // Test buffer sink
-  SerdBuffer    buffer = {NULL, 0};
-  SerdByteSink* byte_sink =
-    serd_byte_sink_new((SerdWriteFunc)serd_buffer_sink, &buffer, 1);
+  SerdBuffer buffer = {NULL, 0};
 
-  writer = serd_writer_new(
-    world, SERD_TURTLE, 0, env, (SerdWriteFunc)serd_byte_sink_write, byte_sink);
+  byte_sink = serd_byte_sink_new_buffer(&buffer);
+  writer    = serd_writer_new(world, SERD_TURTLE, 0, env, byte_sink);
 
   SerdNode* const base =
     serd_new_uri(SERD_STATIC_STRING("http://example.org/base"));
diff --git a/test/test_terse_write.c b/test/test_terse_write.c
index d6f24357..06d2e0ce 100644
--- a/test/test_terse_write.c
+++ b/test/test_terse_write.c
@@ -73,10 +73,11 @@ test(void)
   serd_env_set_prefix(
     env, SERD_STATIC_STRING("rdf"), SERD_STATIC_STRING(NS_RDF));
 
-  SerdWriter* writer = serd_writer_new(
-    world, SERD_TURTLE, 0, env, (SerdWriteFunc)serd_buffer_sink, &buffer);
+  SerdByteSink* const byte_sink = serd_byte_sink_new_buffer(&buffer);
+  SerdWriter* const   writer =
+    serd_writer_new(world, SERD_TURTLE, 0, env, byte_sink);
 
-  const SerdSink* sink = serd_writer_sink(writer);
+  const SerdSink* const sink = serd_writer_sink(writer);
 
   // Simple lone list
   serd_sink_write(sink, SERD_TERSE_S | SERD_LIST_S, l1, rdf_first, s1, NULL);
@@ -108,6 +109,7 @@ test(void)
 
   serd_buffer_sink_finish(&buffer);
   serd_writer_free(writer);
+  serd_byte_sink_free(byte_sink);
   serd_nodes_free(nodes);
   serd_env_free(env);
   serd_world_free(world);