aboutsummaryrefslogtreecommitdiffstats
path: root/tests/serd_test.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-16 12:42:58 +0200
committerDavid Robillard <d@drobilla.net>2020-10-27 13:13:58 +0100
commit2f2f791edb3ae4ccb825db548050461568570e03 (patch)
tree69be27d0d5fc7bac9897550185e02b579eaaf197 /tests/serd_test.c
parent45358052fb4fa254f06d0d704a27c5ed9608cc58 (diff)
downloadserd-2f2f791edb3ae4ccb825db548050461568570e03.tar.gz
serd-2f2f791edb3ae4ccb825db548050461568570e03.tar.bz2
serd-2f2f791edb3ae4ccb825db548050461568570e03.zip
Simplify reader interface
Diffstat (limited to 'tests/serd_test.c')
-rw-r--r--tests/serd_test.c26
1 files changed, 18 insertions, 8 deletions
diff --git a/tests/serd_test.c b/tests/serd_test.c
index f0541593..ff1d2467 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -140,7 +140,12 @@ test_read_chunks(void)
assert(serd_reader_handle(reader) == rt);
assert(f);
- SerdStatus st = serd_reader_start_stream(reader, f, NULL, false);
+ SerdStatus st = serd_reader_start_stream(reader,
+ (SerdSource)fread,
+ (SerdStreamErrorFunc)ferror,
+ f,
+ NULL,
+ 1);
assert(st == SERD_SUCCESS);
// Write two statement separated by null characters
@@ -604,7 +609,12 @@ test_reader(const char* path)
fflush(temp);
fseek(temp, 0L, SEEK_SET);
- serd_reader_start_stream(reader, temp, NULL, true);
+ serd_reader_start_stream(reader,
+ (SerdSource)fread,
+ (SerdStreamErrorFunc)ferror,
+ temp,
+ NULL,
+ 4096);
assert(serd_reader_read_chunk(reader) == SERD_SUCCESS);
assert(serd_reader_read_chunk(reader) == SERD_FAILURE);
@@ -617,12 +627,12 @@ test_reader(const char* path)
// A byte-wise reader that hits EOF once then continues (like a socket)
{
size_t n_reads = 0;
- serd_reader_start_source_stream(reader,
- (SerdSource)eof_test_read,
- (SerdStreamErrorFunc)eof_test_error,
- &n_reads,
- NULL,
- 1);
+ serd_reader_start_stream(reader,
+ (SerdSource)eof_test_read,
+ (SerdStreamErrorFunc)eof_test_error,
+ &n_reads,
+ NULL,
+ 1);
assert(serd_reader_read_chunk(reader) == SERD_SUCCESS);
assert(serd_reader_read_chunk(reader) == SERD_FAILURE);