diff options
| author | David Robillard <d@drobilla.net> | 2018-06-13 21:32:11 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-04-13 19:15:32 +0200 |
| commit | 37251f892794e7accbabbe8a2816ad71191e2174 (patch) | |
| tree | ec65a6e7630e79acaf15de00f2fb223ada07d3ee /src/writer.c | |
| parent | 2402d960c54981abb34a79982ecd61a00f798901 (diff) | |
| download | serd-37251f892794e7accbabbe8a2816ad71191e2174.tar.gz serd-37251f892794e7accbabbe8a2816ad71191e2174.tar.bz2 serd-37251f892794e7accbabbe8a2816ad71191e2174.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 692139a6..55feb3f0 100644 --- a/src/writer.c +++ b/src/writer.c @@ -514,7 +514,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); @@ -562,9 +562,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); |