From 68a4f7cfbae546831e375e2097bd7efa57a1d565 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 19 Jun 2018 09:39:48 -0400
Subject: Separate style enum from style flags types

---
 serd/serd.h       | 7 ++++++-
 src/serdi.c       | 4 ++--
 src/writer.c      | 2 +-
 tests/serd_test.c | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/serd/serd.h b/serd/serd.h
index 7571c82b..6a5bd1a1 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -302,6 +302,11 @@ typedef enum {
 	SERD_STYLE_BULK        = 1 << 4   /**< Write output in pages. */
 } SerdStyle;
 
+/**
+   Bitwise OR of SerdStyle values.
+*/
+typedef uint32_t SerdStyleFlags;
+
 /**
    Free memory allocated by Serd.
 
@@ -1199,7 +1204,7 @@ SERD_API
 SerdWriter*
 serd_writer_new(SerdWorld*      world,
                 SerdSyntax      syntax,
-                SerdStyle       style,
+                SerdStyleFlags  style,
                 SerdEnv*        env,
                 SerdWriteFunc   ssink,
                 void*           stream);
diff --git a/src/serdi.c b/src/serdi.c
index e8970877..1c47aed3 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -206,7 +206,7 @@ main(int argc, char** argv)
 	SerdWorld* world  = serd_world_new();
 	SerdEnv*   env    = serd_env_new(base);
 
-	int output_style = 0;
+	SerdStyleFlags output_style = 0;
 	if (output_syntax == SERD_NTRIPLES || ascii) {
 		output_style |= SERD_STYLE_ASCII;
 	} else if (output_syntax == SERD_TURTLE) {
@@ -228,7 +228,7 @@ main(int argc, char** argv)
 
 	SerdWriter* writer = serd_writer_new(world,
 	                                     output_syntax,
-	                                     (SerdStyle)output_style,
+	                                     output_style,
 	                                     env,
 	                                     (SerdWriteFunc)fwrite,
 	                                     out_fd);
diff --git a/src/writer.c b/src/writer.c
index 062cb4c5..4b6b5579 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -866,7 +866,7 @@ serd_writer_finish(SerdWriter* writer)
 SerdWriter*
 serd_writer_new(SerdWorld*     world,
                 SerdSyntax     syntax,
-                SerdStyle      style,
+                SerdStyleFlags style,
                 SerdEnv*       env,
                 SerdWriteFunc  ssink,
                 void*          stream)
diff --git a/tests/serd_test.c b/tests/serd_test.c
index ea555950..fff5aa56 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -623,7 +623,7 @@ test_writer(const char* const path)
 
 	SerdWriter* writer = serd_writer_new(world,
 	                                     SERD_TURTLE,
-	                                     (SerdStyle)0,
+	                                     0,
 	                                     env,
 	                                     (SerdWriteFunc)fwrite,
 	                                     fd);
@@ -706,7 +706,7 @@ test_writer(const char* const path)
 	// Test buffer sink
 	SerdBuffer buffer = { NULL, 0 };
 	writer = serd_writer_new(
-		world, SERD_TURTLE, (SerdStyle)0, env, serd_buffer_sink, &buffer);
+		world, SERD_TURTLE, 0, env, serd_buffer_sink, &buffer);
 
 	o = serd_new_uri("http://example.org/base");
 	assert(!serd_writer_set_base_uri(writer, o));
-- 
cgit v1.2.1