1 files changed, 55 insertions, 55 deletions

diff --git a/test/test_statement.c b/test/test_statement.c
index d70542f1..0127b7bf 100644
--- a/test/test_statement.c
+++ b/test/test_statement.c
@@ -16,67 +16,67 @@
 static void
 test_new(void)
 {
-  SerdNode* const u = serd_new_uri(serd_string(NS_EG "s"));
-  SerdNode* const b = serd_new_blank(serd_string("b0"));
-  SerdNode* const l = serd_new_string(serd_string("str"));
-
-  assert(!serd_statement_new(u, b, u, NULL, NULL));
-  assert(!serd_statement_new(l, u, u, NULL, NULL));
-  assert(!serd_statement_new(l, u, b, u, NULL));
-  assert(!serd_statement_new(u, l, b, NULL, NULL));
-  assert(!serd_statement_new(u, l, b, u, NULL));
-  assert(!serd_statement_new(u, u, u, l, NULL));
-
-  serd_node_free(l);
-  serd_node_free(b);
-  serd_node_free(u);
+  SerdNode* const u = serd_new_uri(NULL, serd_string(NS_EG "s"));
+  SerdNode* const b = serd_new_blank(NULL, serd_string("b0"));
+  SerdNode* const l = serd_new_string(NULL, serd_string("str"));
+
+  assert(!serd_statement_new(NULL, u, b, u, NULL, NULL));
+  assert(!serd_statement_new(NULL, l, u, u, NULL, NULL));
+  assert(!serd_statement_new(NULL, l, u, b, u, NULL));
+  assert(!serd_statement_new(NULL, u, l, b, NULL, NULL));
+  assert(!serd_statement_new(NULL, u, l, b, u, NULL));
+  assert(!serd_statement_new(NULL, u, u, u, l, NULL));
+
+  serd_node_free(NULL, l);
+  serd_node_free(NULL, b);
+  serd_node_free(NULL, u);
 }
 
 static void
 test_copy(void)
 {
-  assert(!serd_statement_copy(NULL));
+  assert(!serd_statement_copy(NULL, NULL));
 
-  SerdNode* const f = serd_new_string(serd_string("file"));
-  SerdNode* const s = serd_new_uri(serd_string(NS_EG "s"));
-  SerdNode* const p = serd_new_uri(serd_string(NS_EG "p"));
-  SerdNode* const o = serd_new_uri(serd_string(NS_EG "o"));
-  SerdNode* const g = serd_new_uri(serd_string(NS_EG "g"));
+  SerdNode* const f = serd_new_string(NULL, serd_string("file"));
+  SerdNode* const s = serd_new_uri(NULL, serd_string(NS_EG "s"));
+  SerdNode* const p = serd_new_uri(NULL, serd_string(NS_EG "p"));
+  SerdNode* const o = serd_new_uri(NULL, serd_string(NS_EG "o"));
+  SerdNode* const g = serd_new_uri(NULL, serd_string(NS_EG "g"));
 
-  SerdCaret* const     caret     = serd_caret_new(f, 1, 1);
-  SerdStatement* const statement = serd_statement_new(s, p, o, g, caret);
-  SerdStatement* const copy      = serd_statement_copy(statement);
+  SerdCaret* const     caret     = serd_caret_new(NULL, f, 1, 1);
+  SerdStatement* const statement = serd_statement_new(NULL, s, p, o, g, caret);
+  SerdStatement* const copy      = serd_statement_copy(NULL, statement);
 
   assert(serd_statement_equals(copy, statement));
   assert(serd_caret_equals(serd_statement_caret(copy), caret));
 
-  serd_statement_free(copy);
-  serd_caret_free(caret);
-  serd_statement_free(statement);
-  serd_node_free(g);
-  serd_node_free(o);
-  serd_node_free(p);
-  serd_node_free(s);
-  serd_node_free(f);
+  serd_statement_free(NULL, copy);
+  serd_caret_free(NULL, caret);
+  serd_statement_free(NULL, statement);
+  serd_node_free(NULL, g);
+  serd_node_free(NULL, o);
+  serd_node_free(NULL, p);
+  serd_node_free(NULL, s);
+  serd_node_free(NULL, f);
 }
 
 static void
 test_free(void)
 {
-  serd_statement_free(NULL);
+  serd_statement_free(NULL, NULL);
 }
 
 static void
 test_fields(void)
 {
-  SerdNode* const f = serd_new_string(serd_string("file"));
-  SerdNode* const s = serd_new_uri(serd_string(NS_EG "s"));
-  SerdNode* const p = serd_new_uri(serd_string(NS_EG "p"));
-  SerdNode* const o = serd_new_uri(serd_string(NS_EG "o"));
-  SerdNode* const g = serd_new_uri(serd_string(NS_EG "g"));
+  SerdNode* const f = serd_new_string(NULL, serd_string("file"));
+  SerdNode* const s = serd_new_uri(NULL, serd_string(NS_EG "s"));
+  SerdNode* const p = serd_new_uri(NULL, serd_string(NS_EG "p"));
+  SerdNode* const o = serd_new_uri(NULL, serd_string(NS_EG "o"));
+  SerdNode* const g = serd_new_uri(NULL, serd_string(NS_EG "g"));
 
-  SerdCaret* const     caret     = serd_caret_new(f, 1, 1);
-  SerdStatement* const statement = serd_statement_new(s, p, o, g, caret);
+  SerdCaret* const     caret     = serd_caret_new(NULL, f, 1, 1);
+  SerdStatement* const statement = serd_statement_new(NULL, s, p, o, g, caret);
 
   assert(serd_statement_equals(statement, statement));
   assert(!serd_statement_equals(statement, NULL));
@@ -103,29 +103,29 @@ test_fields(void)
   assert(!serd_statement_matches(statement, NULL, NULL, s, NULL));
   assert(!serd_statement_matches(statement, NULL, NULL, NULL, s));
 
-  SerdStatement* const diff_s = serd_statement_new(o, p, o, g, caret);
+  SerdStatement* const diff_s = serd_statement_new(NULL, o, p, o, g, caret);
   assert(!serd_statement_equals(statement, diff_s));
-  serd_statement_free(diff_s);
+  serd_statement_free(NULL, diff_s);
 
-  SerdStatement* const diff_p = serd_statement_new(s, o, o, g, caret);
+  SerdStatement* const diff_p = serd_statement_new(NULL, s, o, o, g, caret);
   assert(!serd_statement_equals(statement, diff_p));
-  serd_statement_free(diff_p);
+  serd_statement_free(NULL, diff_p);
 
-  SerdStatement* const diff_o = serd_statement_new(s, p, s, g, caret);
+  SerdStatement* const diff_o = serd_statement_new(NULL, s, p, s, g, caret);
   assert(!serd_statement_equals(statement, diff_o));
-  serd_statement_free(diff_o);
+  serd_statement_free(NULL, diff_o);
 
-  SerdStatement* const diff_g = serd_statement_new(s, p, o, s, caret);
+  SerdStatement* const diff_g = serd_statement_new(NULL, s, p, o, s, caret);
   assert(!serd_statement_equals(statement, diff_g));
-  serd_statement_free(diff_g);
-
-  serd_statement_free(statement);
-  serd_caret_free(caret);
-  serd_node_free(g);
-  serd_node_free(o);
-  serd_node_free(p);
-  serd_node_free(s);
-  serd_node_free(f);
+  serd_statement_free(NULL, diff_g);
+
+  serd_statement_free(NULL, statement);
+  serd_caret_free(NULL, caret);
+  serd_node_free(NULL, g);
+  serd_node_free(NULL, o);
+  serd_node_free(NULL, p);
+  serd_node_free(NULL, s);
+  serd_node_free(NULL, f);
 }
 
 int