diff options
Diffstat (limited to 'vec.c')
| -rw-r--r-- | vec.c | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -1,18 +1,20 @@ #include <string.h> +#include "assert.h" #include "vec.h" -Vec *_Vec_new(Arena *a, int size, ptrdiff_t cap, int align) { - Vec *v = new (a, Vec, 1); - v->data = alloc(a, cap, size, align); - v->size = size; - v->align = align; - v->cap = cap; - v->len = 0; +Vec _Vec_new(Arena *a, int size, ptrdiff_t cap, int align) { + assert(cap > 0); + Vec v = {0}; + v.data = alloc(a, cap, size, align); + v.size = size; + v.align = align; + v.cap = cap; + v.len = 0; return v; } -Vec *Vec_push(Arena *a, Vec *v, void *data) { +void Vec_push(Arena *a, Vec *v, void *data) { if (v->len == v->cap) { void *cpy = alloc(a, v->cap * 2, v->size, v->align); memcpy(cpy, v->data, v->len * v->size); @@ -20,7 +22,6 @@ Vec *Vec_push(Arena *a, Vec *v, void *data) { } memcpy(v->data + v->len * v->size, data, v->size); v->len++; - return v; } void *_Vec_get(Vec *v, int pos) { |
