1 files changed, 26 insertions, 26 deletions

diff --git a/source/kit/input_buffer.c b/source/kit/input_buffer.c
index 2e74cad..362b7b8 100644
--- a/source/kit/input_buffer.c
+++ b/source/kit/input_buffer.c
@@ -4,14 +4,14 @@
 #include <string.h>
 
 typedef struct {
-  ptrdiff_t       ref_count;
-  kit_is_handle_t upstream;
-  kit_allocator_t alloc;
-  kit_string_t    data;
+  ptrdiff_t        ref_count;
+  kit_is_handle_t  upstream;
+  kit_allocator_t *alloc;
+  kit_string_t     data;
 } internal_buffer_t;
 
-static internal_buffer_t *buf_init(kit_is_handle_t upstream,
-                                   kit_allocator_t alloc) {
+static internal_buffer_t *kit_buf_init_(kit_is_handle_t  upstream,
+                                        kit_allocator_t *alloc) {
   internal_buffer_t *buf = kit_alloc_dispatch(alloc, KIT_ALLOCATE,
                                               sizeof *buf, 0, NULL);
 
@@ -26,19 +26,19 @@ static internal_buffer_t *buf_init(kit_is_handle_t upstream,
   return buf;
 }
 
-static kit_allocator_t buf_alloc(void *p) {
+static kit_allocator_t *kit_buf_alloc_(void *p) {
   assert(p != NULL);
 
   return ((internal_buffer_t *) p)->alloc;
 }
 
-static void buf_acquire(void *p) {
+static void kit_buf_acquire_(void *p) {
   assert(p != NULL);
 
   ((internal_buffer_t *) p)->ref_count++;
 }
 
-static void buf_release(void *p) {
+static void kit_buf_release_(void *p) {
   assert(p != NULL);
 
   internal_buffer_t *buf = (internal_buffer_t *) p;
@@ -49,7 +49,7 @@ static void buf_release(void *p) {
   }
 }
 
-static void buf_adjust(void *p, ptrdiff_t size) {
+static void kit_buf_adjust_(void *p, ptrdiff_t size) {
   assert(p != NULL);
   assert(size >= 0);
 
@@ -65,8 +65,8 @@ static void buf_adjust(void *p, ptrdiff_t size) {
   }
 }
 
-static ptrdiff_t buf_read(void *p, ptrdiff_t offset,
-                          kit_str_t destination) {
+static ptrdiff_t kit_buf_read_(void *p, ptrdiff_t offset,
+                               kit_str_t destination) {
   internal_buffer_t *buf = (internal_buffer_t *) p;
   ptrdiff_t          n   = destination.size < buf->data.size - offset
                                ? destination.size
@@ -75,13 +75,13 @@ static ptrdiff_t buf_read(void *p, ptrdiff_t offset,
   return n;
 }
 
-kit_ib_handle_t kit_ib_wrap(kit_is_handle_t upstream,
-                            kit_allocator_t alloc) {
+kit_ib_handle_t kit_ib_wrap(kit_is_handle_t  upstream,
+                            kit_allocator_t *alloc) {
   kit_ib_handle_t buf;
   memset(&buf, 0, sizeof buf);
   buf.status = KIT_OK;
   DA_INIT(buf.data, 0, alloc);
-  buf.internal = buf_init(upstream, alloc);
+  buf.internal = kit_buf_init_(upstream, alloc);
   if (buf.internal == NULL)
     buf.status = KIT_ERROR_BAD_ALLOC;
   return buf;
@@ -96,17 +96,17 @@ kit_ib_handle_t kit_ib_read(kit_ib_handle_t buf, ptrdiff_t size) {
     return next;
   }
 
-  buf_acquire(buf.internal);
-  buf_adjust(buf.internal, buf.offset + size);
+  kit_buf_acquire_(buf.internal);
+  kit_buf_adjust_(buf.internal, buf.offset + size);
 
-  DA_INIT(next.data, size, buf_alloc(buf.internal));
+  DA_INIT(next.data, size, kit_buf_alloc_(buf.internal));
   if (next.data.size != size)
     next.status = KIT_ERROR_BAD_ALLOC;
 
   kit_str_t destination = { .size   = next.data.size,
                             .values = next.data.values };
-  ptrdiff_t n   = buf_read(buf.internal, buf.offset, destination);
-  next.offset   = buf.offset + n;
+  ptrdiff_t n = kit_buf_read_(buf.internal, buf.offset, destination);
+  next.offset = buf.offset + n;
   next.internal = buf.internal;
 
   DA_RESIZE(next.data, n);
@@ -126,14 +126,14 @@ kit_ib_handle_t kit_ib_read_while(
     return next;
   }
 
-  buf_acquire(buf.internal);
+  kit_buf_acquire_(buf.internal);
 
-  DA_INIT(next.data, 0, buf_alloc(buf.internal));
+  DA_INIT(next.data, 0, kit_buf_alloc_(buf.internal));
 
   ptrdiff_t size = 0;
 
   for (;; ++size) {
-    buf_adjust(buf.internal, buf.offset + size + 1);
+    kit_buf_adjust_(buf.internal, buf.offset + size + 1);
 
     DA_RESIZE(next.data, size + 1);
     if (next.data.size != size + 1)
@@ -141,8 +141,8 @@ kit_ib_handle_t kit_ib_read_while(
 
     kit_str_t destination = { .size   = 1,
                               .values = next.data.values + size };
-    ptrdiff_t n           = buf_read(buf.internal, buf.offset + size,
-                                     destination);
+    ptrdiff_t n = kit_buf_read_(buf.internal, buf.offset + size,
+                                destination);
 
     kit_str_t data = { .size = size + 1, .values = next.data.values };
     if (n != 1 || condition == NULL || condition(data) == 0)
@@ -160,6 +160,6 @@ kit_ib_handle_t kit_ib_read_while(
 }
 
 void kit_ib_destroy(kit_ib_handle_t buf) {
-  buf_release(buf.internal);
+  kit_buf_release_(buf.internal);
   DA_DESTROY(buf.data);
 }