aboutsummaryrefslogtreecommitdiffstats
path: root/src/env.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-03-16 16:21:20 -0400
committerDavid Robillard <d@drobilla.net>2018-05-27 18:18:30 +0200
commit8ce3b77e73a6c172dc0954b3f5aa0e37a10850d0 (patch)
tree9d894ecb157e9c977657dc3dd4d9ca06b3c3e9b0 /src/env.c
parent88ea0c449a8daa8951eca0ae69fd376f86122982 (diff)
downloadserd-8ce3b77e73a6c172dc0954b3f5aa0e37a10850d0.tar.gz
serd-8ce3b77e73a6c172dc0954b3f5aa0e37a10850d0.tar.bz2
serd-8ce3b77e73a6c172dc0954b3f5aa0e37a10850d0.zip
Use char* for strings in public API
The constant casting just makes user code a mess, for no benefit.
Diffstat (limited to 'src/env.c')
-rw-r--r--src/env.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/env.c b/src/env.c
index cf1c3538..7831daf7 100644
--- a/src/env.c
+++ b/src/env.c
@@ -92,7 +92,7 @@ serd_env_set_base_uri(SerdEnv* env,
static inline SerdPrefix*
serd_env_find(const SerdEnv* env,
- const uint8_t* name,
+ const char* name,
size_t name_len)
{
for (size_t i = 0; i < env->n_prefixes; ++i) {
@@ -150,9 +150,9 @@ serd_env_set_prefix(SerdEnv* env,
SERD_API
SerdStatus
-serd_env_set_prefix_from_strings(SerdEnv* env,
- const uint8_t* name,
- const uint8_t* uri)
+serd_env_set_prefix_from_strings(SerdEnv* env,
+ const char* name,
+ const char* uri)
{
const SerdNode name_node = serd_node_from_string(SERD_LITERAL, name);
const SerdNode uri_node = serd_node_from_string(SERD_URI, uri);
@@ -161,7 +161,7 @@ serd_env_set_prefix_from_strings(SerdEnv* env,
}
static inline bool
-is_nameChar(const uint8_t c)
+is_nameChar(const char c)
{
return is_alpha(c) || is_digit(c) || c == '_';
}
@@ -171,7 +171,7 @@ is_nameChar(const uint8_t c)
TODO: This is more strict than it should be.
*/
static inline bool
-is_name(const uint8_t* buf, size_t len)
+is_name(const char* buf, size_t len)
{
for (size_t i = 0; i < len; ++i) {
if (!is_nameChar(buf[i])) {
@@ -213,7 +213,7 @@ serd_env_expand(const SerdEnv* env,
SerdChunk* uri_prefix,
SerdChunk* uri_suffix)
{
- const uint8_t* const colon = (const uint8_t*)memchr(
+ const char* const colon = (const char*)memchr(
curie->buf, ':', curie->n_bytes + 1);
if (curie->type != SERD_CURIE || !colon) {
return SERD_ERR_BAD_ARG;
@@ -244,7 +244,7 @@ serd_env_expand_node(const SerdEnv* env,
return SERD_NODE_NULL;
}
const size_t len = prefix.len + suffix.len;
- uint8_t* buf = (uint8_t*)malloc(len + 1);
+ char* buf = (char*)malloc(len + 1);
SerdNode ret = { buf, len, 0, SERD_URI };
snprintf((char*)buf, ret.n_bytes + 1, "%s%s", prefix.buf, suffix.buf);
return ret;