#include "array.h"
-static char UNUSED id[] = "$Id: array.c,v 1.11 2006/07/01 22:11:48 fw Exp $";
+static char UNUSED id[] = "$Id: array.c,v 1.12 2006/09/30 21:49:46 fw Exp $";
#include <assert.h>
assert(size > 0);
- if (pos_plus1 < pos)
- return NULL;
-
- if (!safemult_sizet(size, pos_plus1, &alloc))
+ if (pos_plus1 == 0 || !safemult_sizet(size, pos_plus1, &alloc))
return NULL;
if (a->allocated < alloc) {
if (a->allocated < totalsize)
return NULL;
- return a->mem + pos * membersize;
+ return a->mem + totalsize;
}
}
-void
-array_free_wipe(array * a)
-{
- if (!array_UNUSABLE(a))
- memset(a->mem, 0, a->allocated);
-
- array_free(a);
-}
-
-
void *
array_start(const array * const a)
{
assert(a != NULL);
assert(membersize > 0);
- if (!pos)
- return;
-
if (!safemult_sizet(membersize, pos, &bytepos)) {
a->used = 0;
return;