From 37acc7772335e5a0987531fb42f0dd9e529b3b4d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 12 Aug 2020 18:24:19 +0200 Subject: Remove "get" from accessor names --- src/writer.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/writer.c') diff --git a/src/writer.c b/src/writer.c index 24c56895..89600e9c 100644 --- a/src/writer.c +++ b/src/writer.c @@ -579,6 +579,10 @@ write_uri_node(SerdWriter* const writer, return sink("a", 1, writer) == 1; } + if (!strcmp(node->buf, NS_RDF "nil")) { + return sink("()", 2, writer) == 2; + } + if (has_scheme && (writer->flags & SERD_WRITE_CURIED) && serd_env_qualify(writer->env, node, &prefix, &suffix) && is_name(suffix.buf, suffix.len)) { @@ -590,7 +594,7 @@ write_uri_node(SerdWriter* const writer, } if (!has_scheme && !supports_uriref(writer) && - !serd_env_get_base_uri(writer->env, NULL)->buf) { + !serd_env_base_uri(writer->env, NULL)->buf) { w_err(writer, SERD_ERR_BAD_ARG, "syntax does not support URI reference <%s>\n", @@ -603,7 +607,7 @@ write_uri_node(SerdWriter* const writer, SerdURIView in_base_uri; SerdURIView uri; SerdURIView abs_uri; - serd_env_get_base_uri(writer->env, &in_base_uri); + serd_env_base_uri(writer->env, &in_base_uri); serd_uri_parse(node->buf, &uri); serd_uri_resolve(&uri, &in_base_uri, &abs_uri); bool rooted = uri_is_under(&writer->base_uri, &writer->root_uri); @@ -1006,7 +1010,7 @@ SerdStatus serd_writer_set_base_uri(SerdWriter* writer, const SerdNode* uri) { if (!serd_env_set_base_uri(writer->env, uri)) { - serd_env_get_base_uri(writer->env, &writer->base_uri); + serd_env_base_uri(writer->env, &writer->base_uri); if (writer->syntax == SERD_TURTLE || writer->syntax == SERD_TRIG) { if (writer->context.graph.type || writer->context.subject.type) { @@ -1020,7 +1024,6 @@ serd_writer_set_base_uri(SerdWriter* writer, const SerdNode* uri) writer->indent = 0; return reset_context(writer, true); } - return SERD_ERR_UNKNOWN; } @@ -1080,7 +1083,7 @@ serd_writer_free(SerdWriter* writer) } SerdEnv* -serd_writer_get_env(SerdWriter* writer) +serd_writer_env(SerdWriter* writer) { return writer->env; } -- cgit v1.2.1