diff options
author | David Robillard <d@drobilla.net> | 2018-05-10 20:59:45 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-05-27 18:23:15 +0200 |
commit | a3b6babaf0186b34d801a75b62253573ef26a154 (patch) | |
tree | 22d0d45a45827da2025073660a38c0a39f5fbba3 /src/byte_source.h | |
parent | 8d1dcc05f7072651c0056221d00d8f1bf3fb80a1 (diff) | |
download | serd-a3b6babaf0186b34d801a75b62253573ef26a154.tar.gz serd-a3b6babaf0186b34d801a75b62253573ef26a154.tar.bz2 serd-a3b6babaf0186b34d801a75b62253573ef26a154.zip |
Hide fopen wrapper and use reader interface consistently
Diffstat (limited to 'src/byte_source.h')
-rw-r--r-- | src/byte_source.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/byte_source.h b/src/byte_source.h index c6c4702e..fa016ee5 100644 --- a/src/byte_source.h +++ b/src/byte_source.h @@ -23,6 +23,8 @@ #include <stddef.h> #include <stdio.h> +typedef int (*SerdStreamCloseFunc)(void*); + typedef struct { const char* filename; unsigned line; @@ -32,6 +34,7 @@ typedef struct { typedef struct { SerdSource 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 Cursor cur; ///< Cursor for error reporting @@ -45,17 +48,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, SerdSource read_func, SerdStreamErrorFunc error_func, + SerdStreamCloseFunc close_func, void* stream, const char* name, size_t page_size); |