diff options
author | David Robillard <d@drobilla.net> | 2018-06-15 09:26:17 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-04-13 19:15:32 +0200 |
commit | 19b358a447cf62da8aff1f4ef0235b04f39499eb (patch) | |
tree | 966fe0e98a7caf157f5ef4031475b92c552f153c /src/byte_sink.h | |
parent | 116d82115163a41541db28882d1614574b789f85 (diff) | |
download | serd-19b358a447cf62da8aff1f4ef0235b04f39499eb.tar.gz serd-19b358a447cf62da8aff1f4ef0235b04f39499eb.tar.bz2 serd-19b358a447cf62da8aff1f4ef0235b04f39499eb.zip |
Bring read/write interface closer to C standard
Diffstat (limited to 'src/byte_sink.h')
-rw-r--r-- | src/byte_sink.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/byte_sink.h b/src/byte_sink.h index dca08825..cd9cbce6 100644 --- a/src/byte_sink.h +++ b/src/byte_sink.h @@ -23,15 +23,15 @@ #include "serd/serd.h" typedef struct SerdByteSinkImpl { - SerdSink sink; - void* stream; - char* buf; - size_t size; - size_t block_size; + SerdWriteFunc sink; + void* stream; + char* buf; + size_t size; + size_t block_size; } SerdByteSink; static inline SerdByteSink -serd_byte_sink_new(SerdSink sink, void* stream, size_t block_size) +serd_byte_sink_new(SerdWriteFunc sink, void* stream, size_t block_size) { SerdByteSink bsink; bsink.sink = sink; @@ -48,7 +48,7 @@ static inline void serd_byte_sink_flush(SerdByteSink* bsink) { if (bsink->block_size > 1 && bsink->size > 0) { - bsink->sink(bsink->buf, bsink->size, bsink->stream); + bsink->sink(bsink->buf, 1, bsink->size, bsink->stream); bsink->size = 0; } } @@ -67,7 +67,7 @@ serd_byte_sink_write(const void* buf, size_t len, SerdByteSink* bsink) if (len == 0) { return 0; } else if (bsink->block_size == 1) { - return bsink->sink(buf, len, bsink->stream); + return bsink->sink(buf, 1, len, bsink->stream); } const size_t orig_len = len; @@ -83,7 +83,7 @@ serd_byte_sink_write(const void* buf, size_t len, SerdByteSink* bsink) // Flush page if buffer is full if (bsink->size == bsink->block_size) { - bsink->sink(bsink->buf, bsink->block_size, bsink->stream); + bsink->sink(bsink->buf, 1, bsink->block_size, bsink->stream); bsink->size = 0; } } |