From 33fc3600004690a9e1868b5fb1ca81da79c2fd61 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 23 Dec 2011 02:44:02 +0000
Subject: Use serd_file_sink.

git-svn-id: http://svn.drobilla.net/sord/trunk@184 3d64ff67-21c5-427c-a301-fe4f08042e5a
---
 sord/sordmm.hpp | 9 +--------
 src/sordi.c     | 9 +--------
 wscript         | 2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/sord/sordmm.hpp b/sord/sordmm.hpp
index cbb5460..b3265d2 100644
--- a/sord/sordmm.hpp
+++ b/sord/sordmm.hpp
@@ -472,13 +472,6 @@ Model::load_file(SerdEnv*           env,
 	serd_reader_free(reader);
 }
 
-static size_t
-file_sink(const void* buf, size_t len, void* stream)
-{
-	FILE* file = (FILE*)stream;
-	return fwrite(buf, 1, len, file);
-}
-
 inline SerdStatus
 Model::write_to_file(const std::string& uri, SerdSyntax syntax, SerdStyle style)
 {
@@ -510,7 +503,7 @@ Model::write_to_file(const std::string& uri, SerdSyntax syntax, SerdStyle style)
 	                                     style,
 	                                     _world.prefixes().c_obj(),
 	                                     &base_uri,
-	                                     file_sink,
+	                                     serd_file_sink,
 	                                     fd);
 
 	serd_env_foreach(_world.prefixes().c_obj(),
diff --git a/src/sordi.c b/src/sordi.c
index 6339459..b781024 100644
--- a/src/sordi.c
+++ b/src/sordi.c
@@ -56,13 +56,6 @@ print_usage(const char* name, bool error)
 	return error ? 1 : 0;
 }
 
-static size_t
-file_sink(const void* buf, size_t len, void* stream)
-{
-	FILE* file = (FILE*)stream;
-	return fwrite(buf, 1, len, file);
-}
-
 bool
 set_syntax(SerdSyntax* syntax, const char* name)
 {
@@ -205,7 +198,7 @@ main(int argc, char** argv)
 	SerdWriter* writer = serd_writer_new(
 		output_syntax,
 		output_style,
-		write_env, &base_uri, file_sink, stdout);
+		write_env, &base_uri, serd_file_sink, stdout);
 
 	// Write @prefix directives
 	serd_env_foreach(env,
diff --git a/wscript b/wscript
index 57218a6..37b407b 100644
--- a/wscript
+++ b/wscript
@@ -46,7 +46,7 @@ def configure(conf):
     conf.env.append_unique('CFLAGS', '-std=c99')
 
     autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
-                      atleast_version='0.5.0', mandatory=True)
+                      atleast_version='0.8.0', mandatory=True)
 
     conf.env['BUILD_TESTS'] = Options.options.build_tests
     conf.env['BUILD_UTILS'] = True
-- 
cgit v1.2.1