aboutsummaryrefslogtreecommitdiffstats
path: root/src/writer.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-09-09 07:38:57 +0000
committerDavid Robillard <d@drobilla.net>2012-09-09 07:38:57 +0000
commita70c8c2b121dc00973f8184cd982cbba00b1529f (patch)
tree7b0d798edde820d4e2454861dabe50c6935e3ee6 /src/writer.c
parent1a7358211eefa6e3ffd8f53efc0e71f1ffd62169 (diff)
downloadserd-a70c8c2b121dc00973f8184cd982cbba00b1529f.tar.gz
serd-a70c8c2b121dc00973f8184cd982cbba00b1529f.tar.bz2
serd-a70c8c2b121dc00973f8184cd982cbba00b1529f.zip
Fix clashing symbol "error" in amalgamation build.
git-svn-id: http://svn.drobilla.net/serd/trunk@384 490d8e77-9747-427b-9fa3-0b8f29cee8a0
Diffstat (limited to 'src/writer.c')
-rw-r--r--src/writer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/writer.c b/src/writer.c
index 84a5d43b..86fe482a 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -103,7 +103,7 @@ typedef enum {
} TextContext;
static void
-error(SerdWriter* writer, SerdStatus st, const char* fmt, ...)
+w_err(SerdWriter* writer, SerdStatus st, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
@@ -219,7 +219,7 @@ write_text(SerdWriter* writer, TextContext ctx,
size = 4;
c = in & 0x07;
} else {
- error(writer, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", in);
+ w_err(writer, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", in);
const uint8_t replacement_char[] = { 0xEF, 0xBF, 0xBD };
len += sink(replacement_char, sizeof(replacement_char), writer);
return len;
@@ -364,7 +364,7 @@ write_node(SerdWriter* writer,
switch (writer->syntax) {
case SERD_NTRIPLES:
if (serd_env_expand(writer->env, node, &uri_prefix, &uri_suffix)) {
- error(writer, SERD_ERR_BAD_CURIE,
+ w_err(writer, SERD_ERR_BAD_CURIE,
"undefined namespace prefix `%s'\n", node->buf);
return false;
}
@@ -603,7 +603,7 @@ serd_writer_end_anon(SerdWriter* writer,
return SERD_SUCCESS;
}
if (serd_stack_is_empty(&writer->anon_stack)) {
- error(writer, SERD_ERR_UNKNOWN,
+ w_err(writer, SERD_ERR_UNKNOWN,
"unexpected end of anonymous node\n");
return SERD_ERR_UNKNOWN;
}