From a20bfec928afe3be17765f7b044ecd7244502689 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 29 Dec 2018 20:05:00 -0500
Subject: Rename SerdStyle to SerdWriterFlags

---
 serd/serd.h  | 10 +++++-----
 src/serdi.c  |  4 ++--
 src/writer.c | 52 ++++++++++++++++++++++++++--------------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/serd/serd.h b/serd/serd.h
index 130e7959..2613ed6f 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -298,7 +298,7 @@ typedef struct {
 } SerdURI;
 
 /**
-   Syntax style options.
+   Writer style options.
 
    The style of the writer output can be controlled by ORing together
    values from this enumeration.  Note that some options are only supported
@@ -307,12 +307,12 @@ typedef struct {
 */
 typedef enum {
 	SERD_STYLE_ASCII = 1 << 0,  /**< Escape all non-ASCII characters. */
-} SerdStyle;
+} SerdWriterFlag;
 
 /**
-   Bitwise OR of SerdStyle values.
+   Bitwise OR of SerdWriterFlag values.
 */
-typedef uint32_t SerdStyleFlags;
+typedef uint32_t SerdWriterFlags;
 
 /**
    Free memory allocated by Serd.
@@ -1316,7 +1316,7 @@ SERD_API
 SerdWriter*
 serd_writer_new(SerdWorld*      world,
                 SerdSyntax      syntax,
-                SerdStyleFlags  style,
+                SerdWriterFlags flags,
                 SerdEnv*        env,
                 SerdWriteFunc   write_func,
                 void*           stream);
diff --git a/src/serdi.c b/src/serdi.c
index 33f384eb..c2ac567c 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -202,14 +202,14 @@ main(int argc, char** argv)
 	SerdWorld* world  = serd_world_new();
 	SerdEnv*   env    = serd_env_new(base);
 
-	const SerdStyleFlags output_style = (ascii ? SERD_STYLE_ASCII : 0);
+	const SerdWriterFlags writer_flags = (ascii ? SERD_STYLE_ASCII : 0);
 
 	SerdByteSink* byte_sink = serd_byte_sink_new(
 		(SerdWriteFunc)fwrite, out_fd, bulk_write ? 4096 : 1);
 
 	SerdWriter* writer = serd_writer_new(world,
 	                                     output_syntax,
-	                                     output_style,
+	                                     writer_flags,
 	                                     env,
 	                                     (SerdWriteFunc)serd_byte_sink_write,
 	                                     byte_sink);
diff --git a/src/writer.c b/src/writer.c
index c0d47863..29dd67c3 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -101,24 +101,24 @@ static const SepRule rules[] = {
 };
 
 struct SerdWriterImpl {
-	SerdWorld*     world;
-	SerdSink       iface;
-	SerdSyntax     syntax;
-	SerdStyleFlags style;
-	SerdEnv*       env;
-	SerdNode*      root_node;
-	SerdURI        root_uri;
-	SerdStack      anon_stack;
-	SerdWriteFunc  write_func;
-	void*          stream;
-	SerdErrorSink  error_sink;
-	void*          error_handle;
-	WriteContext   context;
-	unsigned       indent;
-	char*          bprefix;
-	size_t         bprefix_len;
-	Sep            last_sep;
-	bool           empty;
+	SerdWorld*      world;
+	SerdSink        iface;
+	SerdSyntax      syntax;
+	SerdWriterFlags flags;
+	SerdEnv*        env;
+	SerdNode*       root_node;
+	SerdURI         root_uri;
+	SerdStack       anon_stack;
+	SerdWriteFunc   write_func;
+	void*           stream;
+	SerdErrorSink   error_sink;
+	void*           msg_handle;
+	WriteContext    context;
+	unsigned        indent;
+	char*           bprefix;
+	size_t          bprefix_len;
+	Sep             last_sep;
+	bool            empty;
 };
 
 typedef enum {
@@ -191,7 +191,7 @@ write_character(SerdWriter* writer, const uint8_t* utf8, size_t* size)
 		break;
 	}
 
-	if (!(writer->style & SERD_STYLE_ASCII)) {
+	if (!(writer->flags & SERD_STYLE_ASCII)) {
 		// Write UTF-8 character directly to UTF-8 output
 		return sink(utf8, *size, writer);
 	}
@@ -895,18 +895,18 @@ serd_writer_finish(SerdWriter* writer)
 }
 
 SerdWriter*
-serd_writer_new(SerdWorld*     world,
-                SerdSyntax     syntax,
-                SerdStyleFlags style,
-                SerdEnv*       env,
-                SerdWriteFunc  write_func,
-                void*          stream)
+serd_writer_new(SerdWorld*      world,
+                SerdSyntax      syntax,
+                SerdWriterFlags flags,
+                SerdEnv*        env,
+                SerdWriteFunc   write_func,
+                void*           stream)
 {
 	const WriteContext context = WRITE_CONTEXT_NULL;
 	SerdWriter*        writer  = (SerdWriter*)calloc(1, sizeof(SerdWriter));
 	writer->world        = world;
 	writer->syntax       = syntax;
-	writer->style        = style;
+	writer->flags        = flags;
 	writer->env          = env;
 	writer->root_node    = NULL;
 	writer->root_uri     = SERD_URI_NULL;
-- 
cgit v1.2.1