From bc8666f26b616523990f20f165705dff73c26d66 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 24 Feb 2019 09:02:00 +0100
Subject: Use consistent naming for function types

---
 serd/serd.h  | 22 +++++++++++-----------
 src/sink.c   |  8 ++++----
 src/sink.h   |  8 ++++----
 src/writer.c |  8 ++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/serd/serd.h b/serd/serd.h
index 153d7113..711d668d 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -759,34 +759,34 @@ serd_node_free(SerdNode* node);
 
    Called whenever the base URI of the serialisation changes.
 */
-typedef SerdStatus (*SerdBaseSink)(void* handle, const SerdNode* uri);
+typedef SerdStatus (*SerdBaseFunc)(void* handle, const SerdNode* uri);
 
 /**
-   Sink (callback) for namespace definitions
+   Sink function for namespace definitions
 
    Called whenever a prefix is defined in the serialisation.
 */
-typedef SerdStatus (*SerdPrefixSink)(void*           handle,
+typedef SerdStatus (*SerdPrefixFunc)(void*           handle,
                                      const SerdNode* name,
                                      const SerdNode* uri);
 
 /**
-   Sink (callback) for statements
+   Sink function for statements
 
    Called for every RDF statement in the serialisation.
 */
-typedef SerdStatus (*SerdStatementSink)(void*                handle,
+typedef SerdStatus (*SerdStatementFunc)(void*                handle,
                                         SerdStatementFlags   flags,
                                         const SerdStatement* statement);
 
 /**
-   Sink (callback) for anonymous node end markers
+   Sink function for anonymous node end markers
 
    This is called to indicate that the anonymous node with the given
    `value` will no longer be referred to by any future statements
    (i.e. the anonymous serialisation of the node is finished).
 */
-typedef SerdStatus (*SerdEndSink)(void* handle, const SerdNode* node);
+typedef SerdStatus (*SerdEndFunc)(void* handle, const SerdNode* node);
 
 /**
    @}
@@ -1033,22 +1033,22 @@ serd_sink_get_env(const SerdSink* sink);
 /// Set a function to be called when the base URI changes
 SERD_API
 SerdStatus
-serd_sink_set_base_func(SerdSink* sink, SerdBaseSink base_func);
+serd_sink_set_base_func(SerdSink* sink, SerdBaseFunc base_func);
 
 /// Set a function to be called when a namespace prefix is defined
 SERD_API
 SerdStatus
-serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixSink prefix_func);
+serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixFunc prefix_func);
 
 /// Set a function to be called when a statement is emitted
 SERD_API
 SerdStatus
-serd_sink_set_statement_func(SerdSink* sink, SerdStatementSink statement_func);
+serd_sink_set_statement_func(SerdSink* sink, SerdStatementFunc statement_func);
 
 /// Set a function to be called when an anonymous node ends
 SERD_API
 SerdStatus
-serd_sink_set_end_func(SerdSink* sink, SerdEndSink end_func);
+serd_sink_set_end_func(SerdSink* sink, SerdEndFunc end_func);
 
 /// Set the base URI
 SERD_API
diff --git a/src/sink.c b/src/sink.c
index 1b693e88..e62136d9 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -46,28 +46,28 @@ serd_sink_get_env(const SerdSink* sink)
 }
 
 SerdStatus
-serd_sink_set_base_func(SerdSink* sink, SerdBaseSink base_func)
+serd_sink_set_base_func(SerdSink* sink, SerdBaseFunc base_func)
 {
 	sink->base = base_func;
 	return SERD_SUCCESS;
 }
 
 SerdStatus
-serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixSink prefix_func)
+serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixFunc prefix_func)
 {
 	sink->prefix = prefix_func;
 	return SERD_SUCCESS;
 }
 
 SerdStatus
-serd_sink_set_statement_func(SerdSink* sink, SerdStatementSink statement_func)
+serd_sink_set_statement_func(SerdSink* sink, SerdStatementFunc statement_func)
 {
 	sink->statement = statement_func;
 	return SERD_SUCCESS;
 }
 
 SerdStatus
-serd_sink_set_end_func(SerdSink* sink, SerdEndSink end_func)
+serd_sink_set_end_func(SerdSink* sink, SerdEndFunc end_func)
 {
 	sink->end = end_func;
 	return SERD_SUCCESS;
diff --git a/src/sink.h b/src/sink.h
index bab46ef6..1aeafc0a 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -25,10 +25,10 @@
 struct SerdSinkImpl {
 	void*             handle;
 	SerdEnv*          env;
-	SerdBaseSink      base;
-	SerdPrefixSink    prefix;
-	SerdStatementSink statement;
-	SerdEndSink       end;
+	SerdBaseFunc      base;
+	SerdPrefixFunc    prefix;
+	SerdStatementFunc statement;
+	SerdEndFunc       end;
 };
 
 #endif  // SERD_SINK_H
diff --git a/src/writer.c b/src/writer.c
index fe77710a..19588c69 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -918,10 +918,10 @@ serd_writer_new(SerdWorld*      world,
 
 	writer->iface.handle    = writer;
 	writer->iface.env       = env;
-	writer->iface.base      = (SerdBaseSink)serd_writer_set_base_uri;
-	writer->iface.prefix    = (SerdPrefixSink)serd_writer_set_prefix;
-	writer->iface.statement = (SerdStatementSink)serd_writer_write_statement;
-	writer->iface.end       = (SerdEndSink)serd_writer_end_anon;
+	writer->iface.base      = (SerdBaseFunc)serd_writer_set_base_uri;
+	writer->iface.prefix    = (SerdPrefixFunc)serd_writer_set_prefix;
+	writer->iface.statement = (SerdStatementFunc)serd_writer_write_statement;
+	writer->iface.end       = (SerdEndFunc)serd_writer_end_anon;
 
 	return writer;
 }
-- 
cgit v1.2.1