From 590172e546b3ce9da482efd25e8e0a260eb7833a Mon Sep 17 00:00:00 2001 From: WormHeamer Date: Thu, 1 Jan 2026 19:29:22 -0500 Subject: add a trailing underscore to dynarr capacity, to help prevent errors --- dynarr.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dynarr.h b/dynarr.h index 8be23f5..b4fb2ec 100644 --- a/dynarr.h +++ b/dynarr.h @@ -7,12 +7,7 @@ #include "wrmr.h" -typedef struct { - u32 n, c; - void *v; -} DynArrHdr; - -#define DYNARR(T) struct { u32 n, c; T *v; } +#define DYNARR(T) struct { u32 n, c_; T *v; } #define DA_INIT_CAP 32 #define DA_ELEM(da, n) ((n) * sizeof(*(da)->v)) @@ -20,8 +15,8 @@ typedef struct { /* malloc */ #define DA_FIT(da, n) do {\ - (da)->c = stdc_bit_ceil(n);\ - (da)->v = realloc((da)->v, DA_ELEM(da, (da)->c));\ + (da)->c_ = stdc_bit_ceil(n);\ + (da)->v = realloc((da)->v, DA_ELEM(da, (da)->c_));\ if (!(da)->v) FAIL_WITH_MSG("failed to realloc dynamic array");\ } while(0) #define DA_GROW(da, n_) DA_FIT(da, (da)->n + (n_)) @@ -39,9 +34,9 @@ typedef struct { #define DA_AFIT(da, a, n) do {\ u32 da_fit_c = stdc_bit_ceil(n);\ - (da)->v = arena_realloc(a, (da)->v, DA_ELEM(da, (da)->c),\ + (da)->v = arena_realloc(a, (da)->v, DA_ELEM(da, (da)->c_),\ DA_ELEM(da, da_fit_c), _Alignof(TYPEOF(*(da)->v)));\ - (da)->c = da_fit_c;\ + (da)->c_ = da_fit_c;\ } while(0) #define DA_AGROW(da, a, n_) DA_AFIT(da, a, (da)->n + (n_)) #define DA_APUSH(da, a, ...) do {\ -- cgit v1.2.3