From 63d07dc3744d1ef134fce4615631808388582518 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 29 Dec 2018 19:56:13 -0500
Subject: Rename SerdType to SerdNodeType

The old name has become ambiguous with the expanded scope of serd.
---
 serd/serd.h  |  6 +++---
 src/node.c   |  6 +++---
 src/node.h   |  6 ++++--
 src/reader.c |  7 +++++--
 src/reader.h | 20 ++++++++++----------
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/serd/serd.h b/serd/serd.h
index 690588a5..31f1f89a 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -222,7 +222,7 @@ typedef enum {
 	   <tt>nodeID</tt></a>
 	*/
 	SERD_BLANK = 4
-} SerdType;
+} SerdNodeType;
 
 /**
    Flags indicating certain string properties relevant to serialisation.
@@ -618,7 +618,7 @@ serd_uri_serialise_relative(const SerdURI* uri,
 */
 SERD_API
 SerdNode*
-serd_new_simple_node(SerdType type, const char* str, size_t len);
+serd_new_simple_node(SerdNodeType type, const char* str, size_t len);
 
 /**
    Create a new plain literal string node from `str`.
@@ -824,7 +824,7 @@ serd_node_free(SerdNode* node);
    Return the type of a node (SERD_URI, SERD_BLANK, or SERD_LITERAL).
 */
 SERD_API
-SerdType
+SerdNodeType
 serd_node_get_type(const SerdNode* node);
 
 /**
diff --git a/src/node.c b/src/node.c
index c5b6f8cb..11fba1b7 100644
--- a/src/node.c
+++ b/src/node.c
@@ -98,7 +98,7 @@ serd_node_total_size(const SerdNode* node)
 }
 
 SerdNode*
-serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdType type)
+serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdNodeType type)
 {
 	const size_t size = sizeof(SerdNode) + serd_node_pad_size(n_bytes);
 	SerdNode*    node = (SerdNode*)calloc(1, size);
@@ -125,7 +125,7 @@ serd_node_set(SerdNode** dst, const SerdNode* src)
 }
 
 SerdNode*
-serd_new_simple_node(SerdType type, const char* str, const size_t len)
+serd_new_simple_node(SerdNodeType type, const char* str, const size_t len)
 {
 	if (!str) {
 		return NULL;
@@ -697,7 +697,7 @@ serd_new_blob(const void*     buf,
 	return node;
 }
 
-SerdType
+SerdNodeType
 serd_node_get_type(const SerdNode* node)
 {
 	return node->type;
diff --git a/src/node.h b/src/node.h
index 9a205a6e..3f8ec628 100644
--- a/src/node.h
+++ b/src/node.h
@@ -24,7 +24,7 @@
 struct SerdNodeImpl {
 	size_t        n_bytes;  /**< Size in bytes (not including null) */
 	SerdNodeFlags flags;    /**< Node flags (e.g. string properties) */
-	SerdType      type;     /**< Node type */
+	SerdNodeType  type;     /**< Node type */
 };
 
 static inline char*
@@ -39,7 +39,9 @@ serd_node_buffer_c(const SerdNode* node)
 	return (const char*)(node + 1);
 }
 
-SerdNode* serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdType type);
+SerdNode*
+serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdNodeType type);
+
 void      serd_node_set(SerdNode** dst, const SerdNode* src);
 size_t    serd_node_total_size(const SerdNode* node);
 void      serd_node_zero_pad(SerdNode* node);
diff --git a/src/reader.c b/src/reader.c
index 1337a6a4..70bedc31 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -75,7 +75,7 @@ blank_id(SerdReader* reader)
 
 SerdNode*
 push_node_padded(SerdReader* reader, size_t maxlen,
-                 SerdType type, const char* str, size_t n_bytes)
+                 SerdNodeType type, const char* str, size_t n_bytes)
 {
 	// Push a null byte to ensure the previous node was null terminated
 	char* terminator = (char*)serd_stack_push(&reader->stack, 1);
@@ -109,7 +109,10 @@ push_node_padded(SerdReader* reader, size_t maxlen,
 }
 
 SerdNode*
-push_node(SerdReader* reader, SerdType type, const char* str, size_t n_bytes)
+push_node(SerdReader*  reader,
+          SerdNodeType type,
+          const char*  str,
+          size_t       n_bytes)
 {
 	return push_node_padded(reader, n_bytes, type, str, n_bytes);
 }
diff --git a/src/reader.h b/src/reader.h
index ad07f601..79f4ad3b 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -76,16 +76,16 @@ struct SerdReaderImpl {
 SERD_LOG_FUNC(3, 4)
 SerdStatus r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...);
 
-SerdNode* push_node_padded(SerdReader* reader,
-                           size_t      maxlen,
-                           SerdType    type,
-                           const char* str,
-                           size_t      n_bytes);
-
-SerdNode* push_node(SerdReader* reader,
-                    SerdType    type,
-                    const char* str,
-                    size_t      n_bytes);
+SerdNode* push_node_padded(SerdReader*  reader,
+                           size_t       maxlen,
+                           SerdNodeType type,
+                           const char*  str,
+                           size_t       n_bytes);
+
+SerdNode* push_node(SerdReader*  reader,
+                    SerdNodeType type,
+                    const char*  str,
+                    size_t       n_bytes);
 
 size_t    genid_size(SerdReader* reader);
 SerdNode* blank_id(SerdReader* reader);
-- 
cgit v1.2.1