From 58890c798fbd87a2080c2fa8cc206a2631c3e558 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 1 Mar 2021 13:24:02 -0500 Subject: Use consistent naming for function types --- src/reader.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/reader.c') diff --git a/src/reader.c b/src/reader.c index 0c4ff5e2..d5de67d2 100644 --- a/src/reader.c +++ b/src/reader.c @@ -37,7 +37,7 @@ r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...) va_start(args, fmt); const Cursor* const cur = &reader->source.cur; const SerdError e = {st, cur->filename, cur->line, cur->col, fmt, &args}; - serd_error(reader->error_sink, reader->error_handle, &e); + serd_error(reader->error_func, reader->error_handle, &e); va_end(args); return st; } @@ -132,9 +132,9 @@ emit_statement(SerdReader* reader, ReadContext ctx, Ref o) graph = reader->default_graph; } - const SerdStatus st = !reader->statement_sink + const SerdStatus st = !reader->statement_func ? SERD_SUCCESS - : reader->statement_sink(reader->handle, + : reader->statement_func(reader->handle, *ctx.flags, graph, deref(reader, ctx.subject), @@ -169,18 +169,18 @@ SerdReader* serd_reader_new(SerdSyntax syntax, void* handle, void (*free_handle)(void*), - SerdBaseSink base_sink, - SerdPrefixSink prefix_sink, - SerdStatementSink statement_sink, - SerdEndSink end_sink) + SerdBaseFunc base_func, + SerdPrefixFunc prefix_func, + SerdStatementFunc statement_func, + SerdEndFunc end_func) { SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader)); me->handle = handle; me->free_handle = free_handle; - me->base_sink = base_sink; - me->prefix_sink = prefix_sink; - me->statement_sink = statement_sink; - me->end_sink = end_sink; + me->base_func = base_func; + me->prefix_func = prefix_func; + me->statement_func = statement_func; + me->end_func = end_func; me->default_graph = NULL; me->stack = serd_stack_new(SERD_PAGE_SIZE); me->syntax = syntax; @@ -202,10 +202,10 @@ serd_reader_set_strict(SerdReader* reader, bool strict) void serd_reader_set_error_sink(SerdReader* reader, - SerdErrorSink error_sink, + SerdErrorFunc error_func, void* error_handle) { - reader->error_sink = error_sink; + reader->error_func = error_func; reader->error_handle = error_handle; } -- cgit v1.2.1