#include "array.h"
-static char UNUSED id[] = "$Id: array.c,v 1.10 2006/05/09 17:02:40 fw Exp $";
+static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";
#include <assert.h>
#define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) )
-#define ALIGN_32U(x) (((x) | 0x1fU) +1)
-#define ALIGN_1024U(x) (((x) | 0x3ffU) +1)
-#define ALIGN_4096U(x) (((x) | 0xfffU) +1)
+#define ALIGN_32U(x) (((x)+(unsigned)31 ) & ~((unsigned)31))
+#define ALIGN_1024U(x) (((x)+(unsigned)1023) & ~((unsigned)1023))
+#define ALIGN_4096U(x) (((x)+(unsigned)4095) & ~((unsigned)4095))
static bool
safemult_sizet(size_t a, size_t b, size_t *res)
{
- size_t tmp;
-
- tmp = a * b;
+ size_t tmp = a * b;
if (b && (tmp / b != a))
return false;
a->allocated = 0;
a->used = 0;
}
-
+
/* if realloc() fails, array_alloc return NULL. otherwise return pointer to elem pos in array */
void *
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) {
array_get(array * a, size_t membersize, size_t pos)
{
size_t totalsize;
+ size_t posplus1 = pos + 1;
assert(membersize > 0);
assert(a != NULL);
- if (array_UNUSABLE(a))
+ if (!posplus1 || array_UNUSABLE(a))
return NULL;
- if (!safemult_sizet(pos, membersize, &totalsize))
+ if (!safemult_sizet(posplus1, membersize, &totalsize))
return NULL;
if (a->allocated < totalsize)
return NULL;
- return a->mem + pos * membersize;
+ totalsize = pos * membersize;
+ return a->mem + totalsize;
}
array_free(array * a)
{
assert(a != NULL);
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
Log(LOG_DEBUG,
"array_free(): %u bytes free'd (%u bytes still used at time of free()).",
a->allocated, a->used);
a->used = 0;
}
-
void
-array_free_wipe(array * a)
+array_free_wipe(array *a)
{
- if (!array_UNUSABLE(a))
- memset(a->mem, 0, a->allocated);
-
+ size_t bytes = a->allocated;
+ if (bytes)
+ memset(a->mem, 0, bytes);
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;