diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/reader.h | 2 | ||||
-rw-r--r-- | src/sink.c | 8 | ||||
-rw-r--r-- | src/sink.h | 8 | ||||
-rw-r--r-- | src/world.c | 8 | ||||
-rw-r--r-- | src/world.h | 2 | ||||
-rw-r--r-- | src/writer.c | 10 |
6 files changed, 19 insertions, 19 deletions
diff --git a/src/reader.h b/src/reader.h index 8c0efe3a..62373fc4 100644 --- a/src/reader.h +++ b/src/reader.h @@ -46,7 +46,7 @@ typedef struct { struct SerdReaderImpl { SerdWorld* world; const SerdSink* sink; - SerdMessageSink msg_sink; + SerdMessageFunc msg_func; void* error_handle; SerdNode* rdf_first; SerdNode* rdf_rest; @@ -46,28 +46,28 @@ serd_sink_get_env(const SerdSink* sink) } SerdStatus -serd_sink_set_base_func(SerdSink* sink, SerdBaseSink base_func) +serd_sink_set_base_func(SerdSink* sink, SerdBaseFunc base_func) { sink->base = base_func; return SERD_SUCCESS; } SerdStatus -serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixSink prefix_func) +serd_sink_set_prefix_func(SerdSink* sink, SerdPrefixFunc prefix_func) { sink->prefix = prefix_func; return SERD_SUCCESS; } SerdStatus -serd_sink_set_statement_func(SerdSink* sink, SerdStatementSink statement_func) +serd_sink_set_statement_func(SerdSink* sink, SerdStatementFunc statement_func) { sink->statement = statement_func; return SERD_SUCCESS; } SerdStatus -serd_sink_set_end_func(SerdSink* sink, SerdEndSink end_func) +serd_sink_set_end_func(SerdSink* sink, SerdEndFunc end_func) { sink->end = end_func; return SERD_SUCCESS; @@ -25,10 +25,10 @@ struct SerdSinkImpl { void* handle; SerdEnv* env; - SerdBaseSink base; - SerdPrefixSink prefix; - SerdStatementSink statement; - SerdEndSink end; + SerdBaseFunc base; + SerdPrefixFunc prefix; + SerdStatementFunc statement; + SerdEndFunc end; }; #endif // SERD_SINK_H diff --git a/src/world.c b/src/world.c index 7b0343cc..13b593b2 100644 --- a/src/world.c +++ b/src/world.c @@ -53,8 +53,8 @@ serd_world_fopen(SerdWorld* world, const char* path, const char* mode) SerdStatus serd_world_log(const SerdWorld* world, const SerdMessage* msg) { - if (world->msg_sink) { - world->msg_sink(world->msg_handle, msg); + if (world->msg_func) { + world->msg_func(world->msg_handle, msg); } else { fprintf(stderr, "error: "); if (msg->cursor) { @@ -142,9 +142,9 @@ serd_world_get_blank(SerdWorld* world) void serd_world_set_message_sink(SerdWorld* world, - SerdMessageSink msg_sink, + SerdMessageFunc msg_func, void* handle) { - world->msg_sink = msg_sink; + world->msg_func = msg_func; world->msg_handle = handle; } diff --git a/src/world.h b/src/world.h index 9d6dd4d2..ef19fb7f 100644 --- a/src/world.h +++ b/src/world.h @@ -24,7 +24,7 @@ struct SerdWorldImpl { SerdNodes* nodes; - SerdMessageSink msg_sink; + SerdMessageFunc msg_func; void* msg_handle; uint32_t next_blank_id; SerdNode* blank_node; diff --git a/src/writer.c b/src/writer.c index 953de1fb..8000e85a 100644 --- a/src/writer.c +++ b/src/writer.c @@ -110,7 +110,7 @@ struct SerdWriterImpl { SerdStack anon_stack; SerdWriteFunc write_func; void* stream; - SerdMessageSink msg_sink; + SerdMessageFunc msg_func; void* msg_handle; WriteContext context; unsigned indent; @@ -921,10 +921,10 @@ serd_writer_new(SerdWorld* world, writer->iface.handle = writer; writer->iface.env = env; - writer->iface.base = (SerdBaseSink)serd_writer_set_base_uri; - writer->iface.prefix = (SerdPrefixSink)serd_writer_set_prefix; - writer->iface.statement = (SerdStatementSink)serd_writer_write_statement; - writer->iface.end = (SerdEndSink)serd_writer_end_anon; + writer->iface.base = (SerdBaseFunc)serd_writer_set_base_uri; + writer->iface.prefix = (SerdPrefixFunc)serd_writer_set_prefix; + writer->iface.statement = (SerdStatementFunc)serd_writer_write_statement; + writer->iface.end = (SerdEndFunc)serd_writer_end_anon; return writer; } |