aboutsummaryrefslogtreecommitdiffstats
path: root/serd
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-03-15 23:21:34 -0400
committerDavid Robillard <d@drobilla.net>2018-11-25 09:21:03 +0100
commitf046eb982627f344fc0eeff6be82028318862e67 (patch)
treea8216165d6e74ff5650e4cdd5a2a44b05b611f63 /serd
parentfc6ef04d8b94909523708c1bdbb9ea8f42063662 (diff)
downloadserd-f046eb982627f344fc0eeff6be82028318862e67.tar.gz
serd-f046eb982627f344fc0eeff6be82028318862e67.tar.bz2
serd-f046eb982627f344fc0eeff6be82028318862e67.zip
Use SerdBuffer for mutable buffers
This avoids const violations from abusing SerdChunk as a mutable buffer for string sinks.
Diffstat (limited to 'serd')
-rw-r--r--serd/serd.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/serd/serd.h b/serd/serd.h
index 49a516fa..105b80a9 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -231,6 +231,14 @@ typedef struct {
} SerdChunk;
/**
+ A mutable buffer in memory.
+*/
+typedef struct {
+ void* buf; /**< Buffer */
+ size_t len; /**< Size of buffer in bytes */
+} SerdBuffer;
+
+/**
An error description.
*/
typedef struct {
@@ -972,24 +980,24 @@ serd_file_sink(const void* buf, size_t len, void* stream);
/**
A convenience sink function for writing to a string.
- This function can be used as a SerdSink to write to a SerdChunk which is
+ This function can be used as a SerdSink to write to a SerdBuffer which is
resized as necessary with realloc(). The `stream` parameter must point to
- an initialized SerdChunk. When the write is finished, the string should be
- retrieved with serd_chunk_sink_finish().
+ an initialized SerdBuffer. When the write is finished, the string should be
+ retrieved with serd_buffer_sink_finish().
*/
SERD_API
size_t
-serd_chunk_sink(const void* buf, size_t len, void* stream);
+serd_buffer_sink(const void* buf, size_t len, void* stream);
/**
- Finish a serialisation to a chunk with serd_chunk_sink().
+ Finish a serialisation to a chunk with serd_buffer_sink().
The returned string is the result of the serialisation, which is NULL
terminated (by this function) and owned by the caller.
*/
SERD_API
uint8_t*
-serd_chunk_sink_finish(SerdChunk* stream);
+serd_buffer_sink_finish(SerdBuffer* stream);
/**
Set a function to be called when errors occur during writing.