diff options
| author | David Robillard <d@drobilla.net> | 2018-05-27 18:16:08 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2018-05-27 18:16:08 +0200 |
| commit | a0c483d9f1f3955499560ef1536fdb760df274fb (patch) | |
| tree | fa46603a7180e17a3d4e78ea088969d48babc79c /src | |
| parent | 120b99b1cb02f153ec6f4071a8071ac08cb9d074 (diff) | |
| download | serd-a0c483d9f1f3955499560ef1536fdb760df274fb.tar.gz serd-a0c483d9f1f3955499560ef1536fdb760df274fb.tar.bz2 serd-a0c483d9f1f3955499560ef1536fdb760df274fb.zip | |
Clarify errors returned by serd_env_expand()
Diffstat (limited to 'src')
| -rw-r--r-- | src/env.c | 6 | ||||
| -rw-r--r-- | src/writer.c | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -215,8 +215,8 @@ serd_env_expand(const SerdEnv* env, { const uint8_t* const colon = (const uint8_t*)memchr( curie->buf, ':', curie->n_bytes + 1); - if (!colon) { - return SERD_ERR_BAD_ARG; // Invalid CURIE + if (curie->type != SERD_CURIE || !colon) { + return SERD_ERR_BAD_ARG; } const size_t name_len = colon - curie->buf; @@ -228,7 +228,7 @@ serd_env_expand(const SerdEnv* env, uri_suffix->len = curie->n_bytes - (colon - curie->buf) - 1; return SERD_SUCCESS; } - return SERD_ERR_NOT_FOUND; + return SERD_ERR_BAD_CURIE; } SERD_API diff --git a/src/writer.c b/src/writer.c index 58cf17ee..603ca65e 100644 --- a/src/writer.c +++ b/src/writer.c @@ -525,14 +525,14 @@ write_curie(SerdWriter* const writer, const Field field, const SerdStatementFlags flags) { - SerdChunk prefix; - SerdChunk suffix; + SerdChunk prefix; + SerdChunk suffix; + SerdStatus st; switch (writer->syntax) { case SERD_NTRIPLES: case SERD_NQUADS: - if (serd_env_expand(writer->env, node, &prefix, &suffix)) { - w_err(writer, SERD_ERR_BAD_CURIE, - "undefined namespace prefix `%s'\n", node->buf); + if ((st = serd_env_expand(writer->env, node, &prefix, &suffix))) { + w_err(writer, st, "undefined namespace prefix `%s'\n", node->buf); return false; } write_sep(writer, SEP_URI_BEGIN); |