aboutsummaryrefslogtreecommitdiffstats
path: root/src/byte_source.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2021-02-25 15:48:04 -0500
committerDavid Robillard <d@drobilla.net>2021-03-07 15:32:24 -0500
commite6abc21f9bde66d8f60078493354ba3713f9fcd8 (patch)
treed509c89987e44ba6cbffa52603ab9394fcc7c3e1 /src/byte_source.h
parentb085fe7aa38e5e2caf82b1fec6b7e6094779dd5a (diff)
downloadserd-e6abc21f9bde66d8f60078493354ba3713f9fcd8.tar.gz
serd-e6abc21f9bde66d8f60078493354ba3713f9fcd8.tar.bz2
serd-e6abc21f9bde66d8f60078493354ba3713f9fcd8.zip
Simplify reader interface
Diffstat (limited to 'src/byte_source.h')
-rw-r--r--src/byte_source.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/byte_source.h b/src/byte_source.h
index f0df9bf3..d2c19de3 100644
--- a/src/byte_source.h
+++ b/src/byte_source.h
@@ -23,7 +23,8 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
-#include <stdio.h>
+
+typedef int (*SerdStreamCloseFunc)(void*);
typedef struct {
const char* filename;
@@ -34,6 +35,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
@@ -48,15 +50,13 @@ typedef struct {
} SerdByteSource;
SerdStatus
-serd_byte_source_open_file(SerdByteSource* source, FILE* file, bool bulk);
-
-SerdStatus
serd_byte_source_open_string(SerdByteSource* source, const char* utf8);
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);