diff options
| author | Max <mparisi@stevens.edu> | 2020-09-16 23:46:29 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-16 23:46:29 -0400 |
| commit | 67a6a88f3401706d4c44c40080559b63d2315830 (patch) | |
| tree | 07bf2eef1650924378ab7c154b1c5687e059a45f /src/darray.c | |
| parent | ea73b61cea2b6e50e0079042eae1185a726e2273 (diff) | |
match ArrayNew
Diffstat (limited to 'src/darray.c')
| -rw-r--r-- | src/darray.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/darray.c b/src/darray.c index 290d365..80a9c4c 100644 --- a/src/darray.c +++ b/src/darray.c @@ -48,29 +48,32 @@ static inline void ArrayBinarySearch(....) #endif
-DArray *ArrayNew(u32 p1, s32 p2, DtorFunction dtor)
+DArray *ArrayNew(u32 elemSz, s32 initialCap, DtorFunction dtor)
{
- DArray *darray = gsimalloc(sizeof(DArray)); // r31
- if (p2 == 0)
- p2 = 8; // r29
+ DArray *darray = gsimalloc(sizeof(DArray));
+ if (initialCap == 0)
+ initialCap = 8; // r29
darray->size = 0;
- darray->capacity = p2;
- darray->elemSz = p1;
- darray->growAmount = p2;
+ darray->capacity = initialCap;
+ darray->elemSz = elemSz;
+ darray->growAmount = initialCap;
darray->elemDtor = dtor;
- if (p2 != 0) {
- darray->buf = gsimalloc(p2 * darray->elemSz);
+ if (initialCap != 0) {
+ darray->buf = gsimalloc(initialCap * darray->elemSz);
} else {
darray->buf = NULL;
}
return darray;
}
+#if 0
+
void ArrayFree(DArray *p1)
{
for (s32 i = 0; i < p1->size; i++) {
if (p1->elemDtor) {
- p1->elemDtor(ArrayNth(p1, i));
+ void *elem = ArrayNth(p1, i);
+ p1->elemDtor(elem);
}
}
gsifree(p1->buf);
@@ -256,4 +259,7 @@ void ArrayClear(DArray *p1) }
}
+#endif
+
+
|