diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/env.c | 10 | ||||
| -rw-r--r-- | src/serd_internal.h | 6 | ||||
| -rw-r--r-- | src/uri.c | 2 | ||||
| -rw-r--r-- | src/writer.c | 6 |
4 files changed, 12 insertions, 12 deletions
@@ -186,7 +186,7 @@ bool serd_env_qualify(const SerdEnv* env, const SerdNode* uri, SerdNode* prefix, - SerdChunk* suffix) + SerdSlice* suffix) { for (size_t i = 0; i < env->n_prefixes; ++i) { const SerdNode* const prefix_uri = &env->prefixes[i].uri; @@ -210,8 +210,8 @@ SERD_API SerdStatus serd_env_expand(const SerdEnv* env, const SerdNode* curie, - SerdChunk* uri_prefix, - SerdChunk* uri_suffix) + SerdSlice* uri_prefix, + SerdSlice* uri_suffix) { const char* const colon = (const char*)memchr( curie->buf, ':', curie->n_bytes + 1); @@ -238,8 +238,8 @@ serd_env_expand_node(const SerdEnv* env, { switch (node->type) { case SERD_CURIE: { - SerdChunk prefix; - SerdChunk suffix; + SerdSlice prefix; + SerdSlice suffix; if (serd_env_expand(env, node, &prefix, &suffix)) { return SERD_NODE_NULL; } diff --git a/src/serd_internal.h b/src/serd_internal.h index d678627f..70ab1e97 100644 --- a/src/serd_internal.h +++ b/src/serd_internal.h @@ -408,7 +408,7 @@ parse_utf8_char(const uint8_t* utf8, size_t* size) /* URI utilities */ static inline bool -chunk_equals(const SerdChunk* a, const SerdChunk* b) +slice_equals(const SerdSlice* a, const SerdSlice* b) { return a->len == b->len && !strncmp((const char*)a->buf, (const char*)b->buf, a->len); @@ -435,8 +435,8 @@ static inline bool uri_is_under(const SerdURI* uri, const SerdURI* root) { if (!root || !root->scheme.len || - !chunk_equals(&root->scheme, &uri->scheme) || - !chunk_equals(&root->authority, &uri->authority)) { + !slice_equals(&root->scheme, &uri->scheme) || + !slice_equals(&root->authority, &uri->authority)) { return false; } @@ -315,7 +315,7 @@ remove_dot_segments(const char* path, size_t len, size_t* up) /// Merge `base` and `path` in-place static void -merge(SerdChunk* base, SerdChunk* path) +merge(SerdSlice* base, SerdSlice* path) { size_t up; const char* begin = remove_dot_segments(path->buf, path->len, &up); diff --git a/src/writer.c b/src/writer.c index e7ec0e09..dfbfc94a 100644 --- a/src/writer.c +++ b/src/writer.c @@ -469,7 +469,7 @@ write_uri_node(SerdWriter* const writer, const SerdStatementFlags flags) { SerdNode prefix; - SerdChunk suffix; + SerdSlice suffix; if (is_inline_start(writer, field, flags)) { ++writer->indent; @@ -525,8 +525,8 @@ write_curie(SerdWriter* const writer, const Field field, const SerdStatementFlags flags) { - SerdChunk prefix; - SerdChunk suffix; + SerdSlice prefix; + SerdSlice suffix; SerdStatus st; switch (writer->syntax) { case SERD_NTRIPLES: |