From a7be33a7640ee51066c41eded5812d9cee5ad27e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 13 Jan 2021 14:31:00 +0100
Subject: Add SerdBuffer type for mutable buffers

This avoids const violations from abusing SerdChunk as a mutable buffer
for string sinks.
---
 src/node.c        | 18 +++++++++---------
 src/serd_config.h |  2 +-
 src/uri.c         | 12 +++++-------
 src/writer.c      | 15 ++++++++-------
 4 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/node.c b/src/node.c
index 02aedbf2..415b4031 100644
--- a/src/node.c
+++ b/src/node.c
@@ -208,28 +208,28 @@ serd_node_new_file_uri(const uint8_t* path,
     }
   }
 
-  SerdChunk chunk = {uri, uri_len};
+  SerdBuffer buffer = {uri, uri_len};
   for (size_t i = 0; i < path_len; ++i) {
     if (is_windows && path[i] == '\\') {
-      serd_chunk_sink("/", 1, &chunk);
+      serd_buffer_sink("/", 1, &buffer);
     } else if (path[i] == '%') {
-      serd_chunk_sink("%%", 2, &chunk);
+      serd_buffer_sink("%%", 2, &buffer);
     } else if (!escape || is_uri_path_char(path[i])) {
-      serd_chunk_sink(path + i, 1, &chunk);
+      serd_buffer_sink(path + i, 1, &buffer);
     } else {
       char escape_str[4] = {'%', 0, 0, 0};
       snprintf(escape_str + 1, sizeof(escape_str) - 1, "%X", (unsigned)path[i]);
-      serd_chunk_sink(escape_str, 3, &chunk);
+      serd_buffer_sink(escape_str, 3, &buffer);
     }
   }
-
-  serd_chunk_sink_finish(&chunk);
+  serd_buffer_sink_finish(&buffer);
 
   if (out) {
-    serd_uri_parse(chunk.buf, out);
+    serd_uri_parse((const uint8_t*)buffer.buf, out);
   }
 
-  return serd_node_from_substring(SERD_URI, chunk.buf, chunk.len);
+  return serd_node_from_substring(
+    SERD_URI, (const uint8_t*)buffer.buf, buffer.len);
 }
 
 SerdNode
diff --git a/src/serd_config.h b/src/serd_config.h
index 15508c81..7f58696e 100644
--- a/src/serd_config.h
+++ b/src/serd_config.h
@@ -29,7 +29,7 @@
 #define SERD_CONFIG_H
 
 // Define version unconditionally so a warning will catch a mismatch
-#define SERD_VERSION "0.30.11"
+#define SERD_VERSION "1.0.1"
 
 #if !defined(SERD_NO_DEFAULT_CONFIG)
 
diff --git a/src/uri.c b/src/uri.c
index ed927695..baeb0fb2 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -41,7 +41,6 @@ serd_file_uri_parse(const uint8_t* uri, uint8_t** hostname)
       if (!(path = (const uint8_t*)strchr((const char*)auth, '/'))) {
         return NULL;
       }
-
       if (hostname) {
         *hostname = (uint8_t*)calloc((size_t)(path - auth + 1), 1);
         memcpy(*hostname, auth, (size_t)(path - auth));
@@ -53,26 +52,25 @@ serd_file_uri_parse(const uint8_t* uri, uint8_t** hostname)
     ++path;
   }
 
-  SerdChunk chunk = {NULL, 0};
+  SerdBuffer buffer = {NULL, 0};
   for (const uint8_t* s = path; *s; ++s) {
     if (*s == '%') {
       if (*(s + 1) == '%') {
-        serd_chunk_sink("%", 1, &chunk);
+        serd_buffer_sink("%", 1, &buffer);
         ++s;
       } else if (is_hexdig(*(s + 1)) && is_hexdig(*(s + 2))) {
         const uint8_t code[3] = {*(s + 1), *(s + 2), 0};
         const uint8_t c       = (uint8_t)strtoul((const char*)code, NULL, 16);
-        serd_chunk_sink(&c, 1, &chunk);
+        serd_buffer_sink(&c, 1, &buffer);
         s += 2;
       } else {
         s += 2; // Junk escape, ignore
       }
     } else {
-      serd_chunk_sink(s, 1, &chunk);
+      serd_buffer_sink(s, 1, &buffer);
     }
   }
-
-  return serd_chunk_sink_finish(&chunk);
+  return serd_buffer_sink_finish(&buffer);
 }
 
 bool
diff --git a/src/writer.c b/src/writer.c
index af2980c5..ee9ae352 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -1105,18 +1105,19 @@ serd_file_sink(const void* buf, size_t len, void* stream)
 }
 
 size_t
-serd_chunk_sink(const void* buf, size_t len, void* stream)
+serd_buffer_sink(const void* buf, size_t len, void* stream)
 {
-  SerdChunk* chunk = (SerdChunk*)stream;
-  chunk->buf       = (uint8_t*)realloc((uint8_t*)chunk->buf, chunk->len + len);
-  memcpy((uint8_t*)chunk->buf + chunk->len, buf, len);
-  chunk->len += len;
+  SerdBuffer* buffer = (SerdBuffer*)stream;
+
+  buffer->buf = (char*)realloc(buffer->buf, buffer->len + len);
+  memcpy((uint8_t*)buffer->buf + buffer->len, buf, len);
+  buffer->len += len;
   return len;
 }
 
 uint8_t*
-serd_chunk_sink_finish(SerdChunk* stream)
+serd_buffer_sink_finish(SerdBuffer* stream)
 {
-  serd_chunk_sink("", 1, stream);
+  serd_buffer_sink("", 1, stream);
   return (uint8_t*)stream->buf;
 }
-- 
cgit v1.2.1