aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/env.c25
-rw-r--r--src/writer.c16
2 files changed, 16 insertions, 25 deletions
diff --git a/src/env.c b/src/env.c
index d969d3df..e3cba79d 100644
--- a/src/env.c
+++ b/src/env.c
@@ -160,27 +160,6 @@ serd_env_set_prefix_from_strings(SerdEnv* env,
return serd_env_set_prefix(env, &name_node, &uri_node);
}
-static inline bool
-is_nameChar(const uint8_t c)
-{
- return is_alpha(c) || is_digit(c) || c == '_';
-}
-
-/**
- Return true iff `buf` is a valid prefixed name suffix.
- TODO: This is more strict than it should be.
-*/
-static inline bool
-is_name(const uint8_t* buf, size_t len)
-{
- for (size_t i = 0; i < len; ++i) {
- if (!is_nameChar(buf[i])) {
- return false;
- }
- }
- return true;
-}
-
SERD_API
bool
serd_env_qualify(const SerdEnv* env,
@@ -197,9 +176,7 @@ serd_env_qualify(const SerdEnv* env,
*prefix = env->prefixes[i].name;
suffix->buf = uri->buf + prefix_uri->n_bytes;
suffix->len = uri->n_bytes - prefix_uri->n_bytes;
- if (is_name(suffix->buf, suffix->len)) {
- return true;
- }
+ return true;
}
}
}
diff --git a/src/writer.c b/src/writer.c
index 603ca65e..5d63b581 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -462,6 +462,19 @@ write_literal(SerdWriter* writer,
return true;
}
+// Return true iff `buf` is a valid prefixed name suffix
+static inline bool
+is_name(const uint8_t* buf, const size_t len)
+{
+ // TODO: This is more strict than it should be.
+ for (size_t i = 0; i < len; ++i) {
+ if (!(is_alpha(buf[i]) || is_digit(buf[i]))) {
+ return false;
+ }
+ }
+ return true;
+}
+
static bool
write_uri_node(SerdWriter* const writer,
const SerdNode* node,
@@ -485,7 +498,8 @@ write_uri_node(SerdWriter* const writer,
&& !strcmp((const char*)node->buf, NS_RDF "nil")) {
return sink("()", 2, writer) == 2;
} else if (has_scheme && (writer->style & SERD_STYLE_CURIED) &&
- serd_env_qualify(writer->env, node, &prefix, &suffix)) {
+ serd_env_qualify(writer->env, node, &prefix, &suffix) &&
+ is_name(suffix.buf, suffix.len)) {
write_uri(writer, prefix.buf, prefix.n_bytes);
sink(":", 1, writer);
write_uri(writer, suffix.buf, suffix.len);