diff options
| author | David Robillard <d@drobilla.net> | 2021-07-09 21:39:31 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-01-13 23:04:26 -0500 |
| commit | 4424a6f7781fcb9095618b2f2c846f3f99859b49 (patch) | |
| tree | 0b26affd734bbfe08aed08968e6dc1d6735ec90d /src | |
| parent | 51f1de0235cfb091fcc481fa97d48326295d2c58 (diff) | |
| download | serd-4424a6f7781fcb9095618b2f2c846f3f99859b49.tar.gz serd-4424a6f7781fcb9095618b2f2c846f3f99859b49.tar.bz2 serd-4424a6f7781fcb9095618b2f2c846f3f99859b49.zip | |
Replace serd_reader_set_strict() with SerdReaderFlags
Diffstat (limited to 'src')
| -rw-r--r-- | src/reader.c | 9 | ||||
| -rw-r--r-- | src/serdi.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/reader.c b/src/reader.c index 661d48ae..73e92d40 100644 --- a/src/reader.c +++ b/src/reader.c @@ -176,6 +176,7 @@ serd_reader_read_document(SerdReader* const reader) SerdReader* serd_reader_new(SerdWorld* const world, const SerdSyntax syntax, + const SerdReaderFlags flags, const SerdSink* const sink, const size_t stack_size) { @@ -190,7 +191,7 @@ serd_reader_new(SerdWorld* const world, me->stack = serd_stack_new(stack_size); me->syntax = syntax; me->next_id = 1; - me->strict = true; + me->strict = !(flags & SERD_READ_LAX); // Reserve a bit of space at the end of the stack to zero pad nodes me->stack.buf_size -= serd_node_align; @@ -208,12 +209,6 @@ serd_reader_new(SerdWorld* const world, } void -serd_reader_set_strict(SerdReader* const reader, const bool strict) -{ - reader->strict = strict; -} - -void serd_reader_free(SerdReader* const reader) { if (!reader) { diff --git a/src/serdi.c b/src/serdi.c index ea6bb22b..3f3bce06 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -100,12 +100,12 @@ main(int argc, char** argv) SerdSyntax input_syntax = SERD_SYNTAX_EMPTY; SerdSyntax output_syntax = SERD_SYNTAX_EMPTY; + SerdReaderFlags reader_flags = 0; SerdWriterFlags writer_flags = 0; bool from_string = false; bool from_stdin = false; bool bulk_read = true; bool bulk_write = false; - bool lax = false; bool osyntax_set = false; bool quiet = false; size_t stack_size = 4194304; @@ -134,8 +134,8 @@ main(int argc, char** argv) } else if (opt == 'h') { return print_usage(prog, false); } else if (opt == 'l') { + reader_flags |= SERD_READ_LAX; writer_flags |= SERD_WRITE_LAX; - lax = true; } else if (opt == 'q') { quiet = true; } else if (opt == 't') { @@ -262,10 +262,9 @@ main(int argc, char** argv) SerdWriter* const writer = serd_writer_new(world, output_syntax, writer_flags, env, byte_sink); - SerdReader* const reader = - serd_reader_new(world, input_syntax, serd_writer_sink(writer), stack_size); + SerdReader* const reader = serd_reader_new( + world, input_syntax, reader_flags, serd_writer_sink(writer), stack_size); - serd_reader_set_strict(reader, !lax); if (quiet) { serd_world_set_error_func(world, quiet_error_func, NULL); } |