From 5c6b16d108c0af6a93aba6aa629b5aa83e0116c9 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 8 Jul 2018 18:46:38 +0200
Subject: Expose SerdByteSink in public API

---
 src/byte_sink.h | 70 ++++-----------------------------------------------------
 1 file changed, 4 insertions(+), 66 deletions(-)

(limited to 'src/byte_sink.h')

diff --git a/src/byte_sink.h b/src/byte_sink.h
index 4425f91f..14053bd6 100644
--- a/src/byte_sink.h
+++ b/src/byte_sink.h
@@ -17,81 +17,19 @@
 #ifndef SERD_BYTE_SINK_H
 #define SERD_BYTE_SINK_H
 
-#include "serd_internal.h"
-#include "system.h"
-
 #include "serd/serd.h"
 
+#include "serd_internal.h"
+
 #include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
 
-typedef struct SerdByteSinkImpl {
+struct SerdByteSinkImpl {
 	SerdWriteFunc sink;
 	void*         stream;
 	char*         buf;
 	size_t        size;
 	size_t        block_size;
-} SerdByteSink;
-
-static inline SerdByteSink
-serd_byte_sink_new(SerdWriteFunc sink, void* stream, size_t block_size)
-{
-	SerdByteSink bsink;
-	bsink.sink       = sink;
-	bsink.stream     = stream;
-	bsink.size       = 0;
-	bsink.block_size = block_size;
-	bsink.buf        = ((block_size > 1)
-	                    ? (char*)serd_allocate_buffer(block_size)
-	                    : NULL);
-	return bsink;
-}
-
-static inline void
-serd_byte_sink_flush(SerdByteSink* bsink)
-{
-	if (bsink->block_size > 1 && bsink->size > 0) {
-		bsink->sink(bsink->buf, 1, bsink->size, bsink->stream);
-		bsink->size = 0;
-	}
-}
-
-static inline void
-serd_byte_sink_free(SerdByteSink* bsink)
-{
-	serd_byte_sink_flush(bsink);
-	free(bsink->buf);
-	bsink->buf = NULL;
-}
-
-static inline size_t
-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, 1, len, bsink->stream);
-	}
-
-	const size_t orig_len = len;
-	while (len) {
-		const size_t space = bsink->block_size - bsink->size;
-		const size_t n     = MIN(space, len);
-
-		// Write as much as possible into the remaining buffer space
-		memcpy(bsink->buf + bsink->size, buf, n);
-		bsink->size += n;
-		buf          = (const char*)buf + n;
-		len         -= n;
-
-		// Flush page if buffer is full
-		if (bsink->size == bsink->block_size) {
-			bsink->sink(bsink->buf, 1, bsink->block_size, bsink->stream);
-			bsink->size = 0;
-		}
-	}
-	return orig_len;
-}
+};
 
 #endif  // SERD_BYTE_SINK_H
-- 
cgit v1.2.1