diff -r 3dc9075df822 -r eb9e7bd40a8e src/buffer.c
--- a/src/buffer.c	Sat Jan 29 14:32:04 2022 +0100
+++ b/src/buffer.c	Sun Jan 30 14:19:00 2022 +0100
@@ -32,12 +32,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-CxBuffer cxBufferCreate(
+CxBuffer *cxBufferCreate(
         void *space,
         size_t capacity,
         int flags
 ) {
-    CxBuffer buffer = (CxBuffer) malloc(sizeof(cx_buffer_s));
+    CxBuffer *buffer = (CxBuffer *) malloc(sizeof(cx_buffer_s));
     if (buffer) {
         buffer->flags = flags;
         if (!space) {
@@ -60,15 +60,15 @@
     return buffer;
 }
 
-void cxBufferDestroy(CxBuffer buffer) {
+void cxBufferDestroy(CxBuffer *buffer) {
     if ((buffer->flags & CX_BUFFER_FREE_CONTENTS) == CX_BUFFER_FREE_CONTENTS) {
         free(buffer->bytes);
     }
     free(buffer);
 }
 
-CxBuffer cxBufferExtract(
-        CxBuffer src,
+CxBuffer *cxBufferExtract(
+        CxBuffer *src,
         size_t start,
         size_t length,
         int flags
@@ -78,7 +78,7 @@
         return NULL;
     }
 
-    CxBuffer dst = (CxBuffer) malloc(sizeof(cx_buffer_s));
+    CxBuffer *dst = (CxBuffer *) malloc(sizeof(cx_buffer_s));
     if (dst) {
         dst->bytes = malloc(length);
         if (!dst->bytes) {
@@ -95,7 +95,7 @@
 }
 
 int cxBufferSeek(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         off_t offset,
         int whence
 ) {
@@ -130,12 +130,12 @@
 
 }
 
-int cxBufferEof(CxBuffer buffer) {
+int cxBufferEof(CxBuffer *buffer) {
     return buffer->pos >= buffer->size;
 }
 
 int cxBufferMinimumCapacity(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         size_t additional_bytes
 ) {
     size_t newcap = buffer->capacity + additional_bytes;
@@ -161,7 +161,7 @@
         void const *ptr,
         size_t size,
         size_t nitems,
-        CxBuffer buffer
+        CxBuffer *buffer
 ) {
     size_t len;
     if (cx_szmul(size, nitems, &len)) {
@@ -202,7 +202,7 @@
         void *ptr,
         size_t size,
         size_t nitems,
-        CxBuffer buffer
+        CxBuffer *buffer
 ) {
     size_t len;
     if (cx_szmul(size, nitems, &len)) {
@@ -224,7 +224,7 @@
 }
 
 int cxBufferPut(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         int c
 ) {
     if (buffer->pos >= buffer->capacity) {
@@ -246,7 +246,7 @@
     return c;
 }
 
-int cxBufferGet(CxBuffer buffer) {
+int cxBufferGet(CxBuffer *buffer) {
     if (cxBufferEof(buffer)) {
         return EOF;
     } else {
@@ -257,14 +257,14 @@
 }
 
 size_t cxBufferPutString(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         const char *str
 ) {
     return cxBufferWrite(str, 1, strlen(str), buffer);
 }
 
 int cxBufferShiftLeft(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         size_t shift
 ) {
     if (shift >= buffer->size) {
@@ -283,7 +283,7 @@
 }
 
 int cxBufferShiftRight(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         size_t shift
 ) {
     size_t req_capacity = buffer->size + shift;
@@ -315,7 +315,7 @@
 }
 
 int cxBufferShift(
-        CxBuffer buffer,
+        CxBuffer *buffer,
         off_t shift
 ) {
     if (shift < 0) {