diff options
Diffstat (limited to 'src/buffer.c')
-rw-r--r-- | src/buffer.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/buffer.c b/src/buffer.c index 490418a..ad50771 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -10,19 +10,7 @@ int buffer_init(Buffer *self, ScopedAllocator *allocator, usize initial_capacity return scoped_allocator_alloc(self->allocator, initial_capacity, (void**)&self->data); } -<<<<<<< HEAD -void buffer_deinit(Buffer *self) { - am_free(self->data); - self->data = NULL; - self->size = 0; - self->capacity = 0; -} - -static CHECK_RESULT int buffer_ensure_capacity_for(Buffer *self, usize size) { - usize capacity; -======= static CHECK_RESULT int buffer_ensure_capacity_for(Buffer *self, usize size) { ->>>>>>> Fixed CHECK_RESULT macro, use scoped allocator void *new_mem; int alloc_result; usize new_capacity; |