diff options
| author | David Robillard <d@drobilla.net> | 2021-07-11 20:47:51 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-01-13 23:03:46 -0500 |
| commit | 71c950bb749c3581ab389edfff9771cb06242e29 (patch) | |
| tree | a1437913131978133e48b21078d900859ce30c43 /src/serd_internal.h | |
| parent | 30f3e6fc2c1e24c429d5d0b7100dc449ade6703f (diff) | |
| download | serd-71c950bb749c3581ab389edfff9771cb06242e29.tar.gz serd-71c950bb749c3581ab389edfff9771cb06242e29.tar.bz2 serd-71c950bb749c3581ab389edfff9771cb06242e29.zip | |
Add SerdWorld for shared library state
Diffstat (limited to 'src/serd_internal.h')
| -rw-r--r-- | src/serd_internal.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/serd_internal.h b/src/serd_internal.h index e16a2c12..1bb2a3bc 100644 --- a/src/serd_internal.h +++ b/src/serd_internal.h @@ -17,6 +17,8 @@ #ifndef SERD_INTERNAL_H #define SERD_INTERNAL_H +#include "world.h" + #include "serd/serd.h" #include <stdio.h> @@ -33,12 +35,16 @@ /* Error reporting */ static inline void -serd_error(SerdErrorFunc error_func, void* handle, const SerdError* e) +serd_error(const SerdWorld* world, const SerdError* e) { - if (error_func) { - error_func(handle, e); + if (world->error_func) { + world->error_func(world->error_handle, e); } else { - fprintf(stderr, "error: %s:%u:%u: ", e->filename, e->line, e->col); + if (e->filename) { + fprintf(stderr, "error: %s:%u:%u: ", e->filename, e->line, e->col); + } else { + fprintf(stderr, "error: "); + } vfprintf(stderr, e->fmt, *e->args); } } |