Use char* for strings in public API

The constant casting just makes user code a mess, for no benefit.

1 files changed, 11 insertions, 16 deletions

diff --git a/test/test_env.c b/test/test_env.c
index b25bd9e2..7c38d481 100644
--- a/test/test_env.c
+++ b/test/test_env.c
@@ -19,11 +19,8 @@
 #include "serd/serd.h"
 
 #include <assert.h>
-#include <stdint.h>
 #include <string.h>
 
-#define USTR(s) ((const uint8_t*)(s))
-
 static SerdStatus
 count_prefixes(void* handle, const SerdNode* name, const SerdNode* uri)
 {
@@ -37,12 +34,11 @@ count_prefixes(void* handle, const SerdNode* name, const SerdNode* uri)
 static void
 test_env(void)
 {
-  SerdNode u = serd_node_from_string(SERD_URI, USTR("http://example.org/foo"));
-  SerdNode b = serd_node_from_string(SERD_CURIE, USTR("invalid"));
-  SerdNode c = serd_node_from_string(SERD_CURIE, USTR("eg.2:b"));
+  SerdNode u   = serd_node_from_string(SERD_URI, "http://example.org/foo");
+  SerdNode b   = serd_node_from_string(SERD_CURIE, "invalid");
+  SerdNode c   = serd_node_from_string(SERD_CURIE, "eg.2:b");
   SerdEnv* env = serd_env_new(NULL);
-  serd_env_set_prefix_from_strings(
-    env, USTR("eg.2"), USTR("http://example.org/"));
+  serd_env_set_prefix_from_strings(env, "eg.2", "http://example.org/");
 
   assert(!serd_env_set_base_uri(env, NULL));
   assert(serd_env_set_base_uri(env, &SERD_NODE_NULL));
@@ -56,33 +52,32 @@ test_env(void)
   assert(serd_node_equals(&xnode, &SERD_NODE_NULL));
 
   SerdNode xu = serd_env_expand_node(env, &u);
-  assert(!strcmp((const char*)xu.buf, "http://example.org/foo"));
+  assert(!strcmp(xu.buf, "http://example.org/foo"));
   serd_node_free(&xu);
 
-  SerdNode badpre  = serd_node_from_string(SERD_CURIE, USTR("hm:what"));
+  SerdNode badpre  = serd_node_from_string(SERD_CURIE, "hm:what");
   SerdNode xbadpre = serd_env_expand_node(env, &badpre);
   assert(serd_node_equals(&xbadpre, &SERD_NODE_NULL));
 
   SerdNode xc = serd_env_expand_node(env, &c);
-  assert(!strcmp((const char*)xc.buf, "http://example.org/b"));
+  assert(!strcmp(xc.buf, "http://example.org/b"));
   serd_node_free(&xc);
 
   assert(serd_env_set_prefix(env, &SERD_NODE_NULL, &SERD_NODE_NULL));
 
-  const SerdNode lit = serd_node_from_string(SERD_LITERAL, USTR("hello"));
+  const SerdNode lit = serd_node_from_string(SERD_LITERAL, "hello");
   assert(serd_env_set_prefix(env, &b, &lit));
 
-  const SerdNode blank  = serd_node_from_string(SERD_BLANK, USTR("b1"));
+  const SerdNode blank  = serd_node_from_string(SERD_BLANK, "b1");
   const SerdNode xblank = serd_env_expand_node(env, &blank);
   assert(serd_node_equals(&xblank, &SERD_NODE_NULL));
 
   int n_prefixes = 0;
-  serd_env_set_prefix_from_strings(
-    env, USTR("eg.2"), USTR("http://example.org/"));
+  serd_env_set_prefix_from_strings(env, "eg.2", "http://example.org/");
   serd_env_foreach(env, count_prefixes, &n_prefixes);
   assert(n_prefixes == 1);
 
-  SerdNode shorter_uri = serd_node_from_string(SERD_URI, USTR("urn:foo"));
+  SerdNode shorter_uri = serd_node_from_string(SERD_URI, "urn:foo");
   SerdNode prefix_name;
   assert(!serd_env_qualify(env, &shorter_uri, &prefix_name, &suffix));