From 9547c806dbf76d6afd1e324fc924abdf944c4bda Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 8 Aug 2021 20:00:43 -0400
Subject: Add a close function to SerdByteSink

This simplifies everything by replacing special cases with a more general close
function.  A type is no longer stored in the structure, so the other
constructors are now essentially syntactic sugar for the universal
serd_byte_sink_new_function().
---
 test/test_model.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'test/test_model.c')

diff --git a/test/test_model.c b/test/test_model.c
index 4cedfb2b..d5b5eb8c 100644
--- a/test/test_model.c
+++ b/test/test_model.c
@@ -1062,16 +1062,18 @@ test_write_flat_range(SerdWorld* world, const unsigned n_quads)
   serd_cursor_free(all);
 
   serd_writer_finish(writer);
-  const char* str      = serd_buffer_sink_finish(&buffer);
-  const char* expected = "<urn:s>\n"
-                         "	<urn:p> _:b1 ,\n"
-                         "		_:b2 .\n"
-                         "\n"
-                         "_:b1\n"
-                         "	<urn:p> <urn:o> .\n"
-                         "\n"
-                         "_:b2\n"
-                         "	<urn:p> <urn:o> .\n";
+  serd_byte_sink_close(out);
+
+  const char* const        str      = (const char*)buffer.buf;
+  static const char* const expected = "<urn:s>\n"
+                                      "\t<urn:p> _:b1 ,\n"
+                                      "\t\t_:b2 .\n"
+                                      "\n"
+                                      "_:b1\n"
+                                      "\t<urn:p> <urn:o> .\n"
+                                      "\n"
+                                      "_:b2\n"
+                                      "\t<urn:p> <urn:o> .\n";
 
   assert(!strcmp(str, expected));
 
@@ -1126,7 +1128,9 @@ test_write_bad_list(SerdWorld* world, const unsigned n_quads)
   serd_cursor_free(all);
 
   serd_writer_finish(writer);
-  const char* str      = serd_buffer_sink_finish(&buffer);
+  serd_byte_sink_close(out);
+
+  const char* str      = (const char*)buffer.buf;
   const char* expected = "<urn:s>\n"
                          "	<urn:p> (\n"
                          "		\"a\"\n"
@@ -1188,7 +1192,8 @@ test_write_infinite_list(SerdWorld* world, const unsigned n_quads)
   serd_cursor_free(all);
 
   serd_writer_finish(writer);
-  const char* str      = serd_buffer_sink_finish(&buffer);
+  serd_byte_sink_close(out);
+  const char* str      = (const char*)buffer.buf;
   const char* expected = "<urn:s>\n"
                          "	<urn:p> _:l1 .\n"
                          "\n"
@@ -1265,7 +1270,8 @@ test_write_error_in_list_subject(SerdWorld* world, const unsigned n_quads)
   for (size_t max_successes = 0; max_successes < 18; ++max_successes) {
     FailingWriteFuncState state = {0, max_successes};
     SerdByteSink*         out =
-      serd_byte_sink_new_function(failing_write_func, &state, 1);
+      serd_byte_sink_new_function(failing_write_func, NULL, &state, 1);
+
     SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
 
     const SerdSink* const sink = serd_writer_sink(writer);
@@ -1320,7 +1326,8 @@ test_write_error_in_list_object(SerdWorld* world, const unsigned n_quads)
   for (size_t max_successes = 0; max_successes < 21; ++max_successes) {
     FailingWriteFuncState state = {0, max_successes};
     SerdByteSink*         out =
-      serd_byte_sink_new_function(failing_write_func, &state, 1);
+      serd_byte_sink_new_function(failing_write_func, NULL, &state, 1);
+
     SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
 
     const SerdSink* const sink = serd_writer_sink(writer);
-- 
cgit v1.2.1