From b2b4fa05b73c6eee51ee9db59726fc404198111a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 4 Feb 2018 15:33:36 +0100
Subject: Make nodes opaque

---
 src/reader.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/reader.c')

diff --git a/src/reader.c b/src/reader.c
index 9b4fe189..97d5dcfd 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -44,9 +44,11 @@ void
 set_blank_id(SerdReader* reader, Ref ref, size_t buf_size)
 {
   SerdNode*   node   = deref(reader, ref);
+  char*       buf    = (char*)(node + 1);
   const char* prefix = reader->bprefix ? (const char*)reader->bprefix : "";
-  node->n_bytes      = (size_t)snprintf(
-    (char*)node->buf, buf_size, "%sb%u", prefix, reader->next_id++);
+
+  node->n_bytes =
+    (size_t)snprintf(buf, buf_size, "%sb%u", prefix, reader->next_id++);
 }
 
 size_t
@@ -93,7 +95,6 @@ push_node_padded(SerdReader*  reader,
   node->n_bytes        = n_bytes;
   node->flags          = 0;
   node->type           = type;
-  node->buf            = NULL;
 
   char* buf = (char*)(node + 1);
   memcpy(buf, str, n_bytes + 1);
@@ -118,12 +119,7 @@ push_node(SerdReader*  reader,
 SerdNode*
 deref(SerdReader* reader, const Ref ref)
 {
-  if (ref) {
-    SerdNode* node = (SerdNode*)(reader->stack.buf + ref);
-    node->buf      = (char*)node + sizeof(SerdNode);
-    return node;
-  }
-  return NULL;
+  return ref ? (SerdNode*)(reader->stack.buf + ref) : NULL;
 }
 
 Ref
@@ -146,8 +142,8 @@ SerdStatus
 emit_statement(SerdReader* reader, ReadContext ctx, Ref o, Ref d, Ref l)
 {
   SerdNode* graph = deref(reader, ctx.graph);
-  if (!graph && reader->default_graph.buf) {
-    graph = &reader->default_graph;
+  if (!graph && reader->default_graph) {
+    graph = reader->default_graph;
   }
 
   const SerdStatus st = !reader->statement_sink
@@ -194,7 +190,7 @@ serd_reader_new(SerdSyntax syntax,
   me->prefix_sink    = prefix_sink;
   me->statement_sink = statement_sink;
   me->end_sink       = end_sink;
-  me->default_graph  = SERD_NODE_NULL;
+  me->default_graph  = NULL;
   me->stack          = serd_stack_new(SERD_PAGE_SIZE);
   me->syntax         = syntax;
   me->next_id        = 1;
@@ -232,7 +228,7 @@ serd_reader_free(SerdReader* reader)
   pop_node(reader, reader->rdf_nil);
   pop_node(reader, reader->rdf_rest);
   pop_node(reader, reader->rdf_first);
-  serd_node_free(&reader->default_graph);
+  serd_node_free(reader->default_graph);
 
 #ifdef SERD_STACK_CHECK
   free(reader->allocs);
@@ -269,7 +265,7 @@ serd_reader_add_blank_prefix(SerdReader* reader, const char* prefix)
 void
 serd_reader_set_default_graph(SerdReader* reader, const SerdNode* graph)
 {
-  serd_node_free(&reader->default_graph);
+  serd_node_free(reader->default_graph);
   reader->default_graph = serd_node_copy(graph);
 }
 
-- 
cgit v1.2.1