Make SerdSink opaque

5 files changed, 90 insertions, 6 deletions

diff --git a/src/n3.c b/src/n3.c
index 62fa0ab4..ece6c1a3 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -17,6 +17,7 @@
 #include "node.h"
 #include "reader.h"
 #include "serd_internal.h"
+#include "sink.h"
 #include "string_utils.h"
 #include "uri_utils.h"
 
diff --git a/src/reader.c b/src/reader.c
index 9da58e79..c38bf279 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -17,6 +17,7 @@
 #include "reader.h"
 
 #include "serd_internal.h"
+#include "sink.h"
 #include "statement.h"
 #include "system.h"
 #include "world.h"
diff --git a/src/sink.c b/src/sink.c
index acba9836..93081ef2 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -14,14 +14,61 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "serd/serd.h"
+#include "sink.h"
 
 #include "statement.h"
 
+#include "serd/serd.h"
+
+#include <stdlib.h>
+
+SerdSink*
+serd_sink_new(void* handle)
+{
+	SerdSink* sink = (SerdSink*)calloc(1, sizeof(SerdSink));
+
+	sink->handle = handle;
+	return sink;
+}
+
+void
+serd_sink_free(SerdSink* sink)
+{
+	free(sink);
+}
+
+SerdStatus
+serd_sink_set_base_func(SerdSink* sink, SerdBaseSink base_func)
+{
+	sink->base = base_func;
+	return SERD_SUCCESS;
+}
+
+SerdStatus
+serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixSink prefix_func)
+{
+	sink->prefix = prefix_func;
+	return SERD_SUCCESS;
+}
+
+SerdStatus
+serd_sink_set_statement_func(SerdSink* sink, SerdStatementSink statement_func)
+{
+	sink->statement = statement_func;
+	return SERD_SUCCESS;
+}
+
+SerdStatus
+serd_sink_set_end_func(SerdSink* sink, SerdEndSink end_func)
+{
+	sink->end = end_func;
+	return SERD_SUCCESS;
+}
+
 SerdStatus
 serd_sink_set_base(const SerdSink* sink, const SerdNode* uri)
 {
-	return sink->base(sink->handle, uri);
+	return sink->base ? sink->base(sink->handle, uri) : SERD_SUCCESS;
 }
 
 SerdStatus
@@ -29,7 +76,7 @@ serd_sink_set_prefix(const SerdSink* sink,
                      const SerdNode* name,
                      const SerdNode* uri)
 {
-	return sink->prefix(sink->handle, name, uri);
+	return sink->prefix ? sink->prefix(sink->handle, name, uri) : SERD_SUCCESS;
 }
 
 SerdStatus
@@ -37,7 +84,8 @@ serd_sink_write_statement(const SerdSink*          sink,
                           const SerdStatementFlags flags,
                           const SerdStatement*     statement)
 {
-	return sink->statement(sink->handle, flags, statement);
+	return sink->statement ? sink->statement(sink->handle, flags, statement)
+	                       : SERD_SUCCESS;
 }
 
 SerdStatus
@@ -50,11 +98,11 @@ serd_sink_write_nodes(const SerdSink*          sink,
 {
 	const SerdStatement statement = { { subject, predicate, object, graph },
 		                              NULL };
-	return sink->statement(sink->handle, flags, &statement);
+	return serd_sink_write_statement(sink, flags, &statement);
 }
 
 SerdStatus
 serd_sink_end(const SerdSink* sink, const SerdNode* node)
 {
-	return sink->end(sink->handle, node);
+	return sink->end ? sink->end(sink->handle, node) : SERD_SUCCESS;
 }
diff --git a/src/sink.h b/src/sink.h
new file mode 100644
index 00000000..03523370
--- /dev/null
+++ b/src/sink.h
@@ -0,0 +1,33 @@
+/*
+  Copyright 2011-2018 David Robillard <http://drobilla.net>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#ifndef SERD_SINK_H
+#define SERD_SINK_H
+
+#include "serd/serd.h"
+
+/**
+   An interface that receives a stream of RDF data.
+*/
+struct SerdSinkImpl {
+	void*             handle;
+	SerdBaseSink      base;
+	SerdPrefixSink    prefix;
+	SerdStatementSink statement;
+	SerdEndSink       end;
+};
+
+#endif  // SERD_SINK_H
diff --git a/src/writer.c b/src/writer.c
index 64be7e11..eb574a97 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -18,6 +18,7 @@
 #include "env.h"
 #include "node.h"
 #include "serd_internal.h"
+#include "sink.h"
 #include "stack.h"
 #include "string_utils.h"
 #include "system.h"