diff options
author | David Robillard <d@drobilla.net> | 2018-02-10 13:32:06 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2020-06-21 18:12:03 +0200 |
commit | 27ee06024c2d54a2340e83e5c90e919f8764ae0f (patch) | |
tree | 75810ccb7871446552f41c76c10a0821c3d46d9c /src/serdi.c | |
parent | 77b496a15d3c263a1bbc7c4cc56583f4014c1d22 (diff) | |
download | serd-27ee06024c2d54a2340e83e5c90e919f8764ae0f.tar.gz serd-27ee06024c2d54a2340e83e5c90e919f8764ae0f.tar.bz2 serd-27ee06024c2d54a2340e83e5c90e919f8764ae0f.zip |
Simplify reader interface
Diffstat (limited to 'src/serdi.c')
-rw-r--r-- | src/serdi.c | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/src/serdi.c b/src/serdi.c index 618b63ff..4524a302 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -25,6 +25,7 @@ #endif #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -123,6 +124,22 @@ quiet_error_sink(void* handle, const SerdError* e) return SERD_SUCCESS; } +/** fread-like wrapper for getc (which is faster). */ +static size_t +serd_file_read_byte(void* buf, size_t size, size_t nmemb, void* stream) +{ + (void)size; + (void)nmemb; + + const int c = getc((FILE*)stream); + if (c == EOF) { + *((uint8_t*)buf) = 0; + return 0; + } + *((uint8_t*)buf) = (uint8_t)c; + return 1; +} + int main(int argc, char** argv) { @@ -297,17 +314,23 @@ main(int argc, char** argv) SerdStatus status = SERD_SUCCESS; if (!from_file) { - status = serd_reader_read_string(reader, input); - } else if (bulk_read) { - status = serd_reader_read_file_handle(reader, in_fd, in_name); + status = serd_reader_start_string(reader, input); } else { - status = serd_reader_start_stream(reader, in_fd, in_name, false); - while (!status) { - status = serd_reader_read_chunk(reader); - } - serd_reader_end_stream(reader); + status = serd_reader_start_stream( + reader, + bulk_read ? (SerdSource)fread : serd_file_read_byte, + (SerdStreamErrorFunc)ferror, + in_fd, + in_name, + bulk_read ? SERD_PAGE_SIZE : 1); + } + + if (!status) { + status = serd_reader_read_document(reader); } + serd_reader_end_stream(reader); + serd_reader_free(reader); serd_writer_finish(writer); serd_writer_free(writer); |