From 8978501e5cf06f366eb14f6ef5f5f7f2f8e34986 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 2 Oct 2022 09:08:22 -0400 Subject: Simplify reader interface --- src/byte_source.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/byte_source.h') diff --git a/src/byte_source.h b/src/byte_source.h index 5290dca2..e2697bd2 100644 --- a/src/byte_source.h +++ b/src/byte_source.h @@ -12,7 +12,8 @@ #include #include #include -#include + +typedef int (*SerdStreamCloseFunc)(void*); typedef struct { const char* filename; @@ -23,6 +24,7 @@ typedef struct { typedef struct { SerdReadFunc read_func; ///< Read function (e.g. fread) SerdStreamErrorFunc error_func; ///< Error function (e.g. ferror) + SerdStreamCloseFunc close_func; ///< Function for closing stream void* stream; ///< Stream (e.g. FILE) size_t page_size; ///< Number of bytes to read at a time size_t buf_size; ///< Number of bytes in file_buf @@ -36,9 +38,6 @@ typedef struct { bool eof; ///< True iff end of file reached } SerdByteSource; -SerdStatus -serd_byte_source_open_file(SerdByteSource* source, FILE* file, bool bulk); - SerdStatus serd_byte_source_open_string(SerdByteSource* source, const char* utf8); @@ -46,6 +45,7 @@ SerdStatus serd_byte_source_open_source(SerdByteSource* source, SerdReadFunc read_func, SerdStreamErrorFunc error_func, + SerdStreamCloseFunc close_func, void* stream, const char* name, size_t page_size); -- cgit v1.2.1