diff options
author | David Robillard <d@drobilla.net> | 2018-06-13 21:32:11 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-11-25 22:12:47 +0100 |
commit | cdbd9de9d8d336b0c5f867b3d6e99788518ad7e8 (patch) | |
tree | 7e2dd7650dd6c0b01f63481d5e637e1d37d6609a /src/writer.c | |
parent | afab9f8037f9281bcef6ee4201061aa234eeadac (diff) | |
download | serd-cdbd9de9d8d336b0c5f867b3d6e99788518ad7e8.tar.gz serd-cdbd9de9d8d336b0c5f867b3d6e99788518ad7e8.tar.bz2 serd-cdbd9de9d8d336b0c5f867b3d6e99788518ad7e8.zip |
Simplify SerdEnv API
Diffstat (limited to 'src/writer.c')
-rw-r--r-- | src/writer.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/writer.c b/src/writer.c index cbd3baa6..64be7e11 100644 --- a/src/writer.c +++ b/src/writer.c @@ -511,7 +511,7 @@ write_uri_node(SerdWriter* const writer, } else if (supports_abbrev(writer) && !strcmp(node_str, 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_in_place(writer->env, node, &prefix, &suffix) && is_name(suffix.buf, suffix.len)) { write_uri_from_node(writer, prefix); sink(":", 1, writer); @@ -559,9 +559,12 @@ write_curie(SerdWriter* const writer, switch (writer->syntax) { case SERD_NTRIPLES: case SERD_NQUADS: - if ((st = serd_env_expand(writer->env, node, &prefix, &suffix))) { - serd_world_errorf(writer->world, st, - "undefined namespace prefix `%s'\n", node_str); + if ((st = serd_env_expand_in_place( + writer->env, node, &prefix, &suffix))) { + serd_world_errorf(writer->world, + st, + "undefined namespace prefix `%s'\n", + node_str); return false; } write_sep(writer, SEP_URI_BEGIN); |