* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
*
- * functions to dynamically allocate arrays.
+ * libarray - dynamically allocate arrays.
* Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- *
*/
-#include "array.h"
+/**
+ * @file
+ * Functions to dynamically allocate arrays.
+ */
-static char UNUSED id[] = "$Id: array.c,v 1.11 2006/07/01 22:11:48 fw Exp $";
+/* Additionan debug messages related to array handling: 0=off / 1=on */
+#define DEBUG_ARRAY 0
-#include <assert.h>
+#include "array.h"
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
-#include "log.h"
-
-/* Enable more Debug messages in alloc / append / memmove code. */
-/* #define DEBUG_ARRAY */
-
-
-
-#define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) )
+#if DEBUG_ARRAY
+# include "log.h"
+#endif
-#define ALIGN_32U(x) (((x)+31U ) & ~(31U))
-#define ALIGN_1024U(x) (((x)+1023U) & ~(1023U))
-#define ALIGN_4096U(x) (((x)+4095U) & ~(4095U))
+#define array_UNUSABLE(x) ( !(x)->mem )
static bool
array_alloc(array * a, size_t size, size_t pos)
{
size_t alloc, pos_plus1 = pos + 1;
- size_t aligned = 0;
char *tmp;
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 (alloc < 128) {
- aligned = ALIGN_32U(alloc);
- } else {
- if (alloc < 4096) {
- aligned = ALIGN_1024U(alloc);
- } else {
- aligned = ALIGN_4096U(alloc);
- }
- }
-#ifdef DEBUG_ARRAY
- Log(LOG_DEBUG, "array_alloc(): rounded %u to %u bytes.", alloc, aligned);
-#endif
-
- assert(aligned >= alloc);
-
- if (aligned < alloc) /* rounding overflow */
- return NULL;
-
- alloc = aligned;
-#ifdef DEBUG_ARRAY
+#if DEBUG_ARRAY
Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.",
- a->allocated, aligned);
+ a->allocated, alloc);
#endif
-
tmp = realloc(a->mem, alloc);
if (!tmp)
return NULL;
a->mem = tmp;
a->allocated = alloc;
-
- assert(a->allocated > a->used);
-
memset(a->mem + a->used, 0, a->allocated - a->used);
-
a->used = alloc;
}
+
+ assert(a->allocated >= a->used);
+
return a->mem + (pos * size);
}
if (array_UNUSABLE(a))
return 0;
+ assert(a->allocated);
return membersize ? a->used / membersize : 0;
}
if (array_UNUSABLE(src))
return false;
+ assert(src->allocated);
return array_copyb(dest, src->mem, src->used);
}
assert(ptr != NULL);
-#ifdef DEBUG_ARRAY
+#if DEBUG_ARRAY
Log(LOG_DEBUG,
"array_catb(): appending %u bytes to array (now %u bytes in array).",
len, tmp);
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
+#if 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;
if (!bytepos)
return; /* nothing to do */
-#ifdef DEBUG_ARRAY
+#if DEBUG_ARRAY
Log(LOG_DEBUG,
"array_moveleft(): %u bytes used in array, starting at position %u.",
a->used, bytepos);