#include "array.h"
-static char UNUSED id[] = "$Id: array.c,v 1.4 2005/07/14 09:14:12 alex Exp $";
+static char UNUSED id[] = "$Id: array.c,v 1.14 2006/12/28 12:53:41 alex Exp $";
#include <assert.h>
#include "log.h"
-#define array_UNUSABLE(x) ( ! x->mem || (0 == x->allocated) )
+/* Enable more Debug messages in alloc / append / memmove code. */
+/* #define DEBUG_ARRAY */
-#define ALIGN_32U(x) ((x | 0x1fU) +1)
-#define ALIGN_1024U(x) ((x | 0x3ffU) +1)
-#define ALIGN_4096U(x) ((x | 0xfffU) +1)
-static bool
-safemult_uint(unsigned int a, unsigned int b, unsigned int *res)
-{
- unsigned int tmp;
+#define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) )
+
+#define ALIGN_32U(x) (((x)+31U ) & ~(31U))
+#define ALIGN_1024U(x) (((x)+1023U) & ~(1023U))
+#define ALIGN_4096U(x) (((x)+4095U) & ~(4095U))
- if (!a || !b) {
- *res = 0;
- return true;
- }
- tmp = a * b;
+static bool
+safemult_sizet(size_t a, size_t b, size_t *res)
+{
+ size_t tmp = a * b;
- if (tmp / b != a)
+ if (b && (tmp / b != a))
return false;
*res = tmp;
}
+void
+array_init(array *a)
+{
+ assert(a != NULL);
+ a->mem = NULL;
+ a->allocated = 0;
+ a->used = 0;
+}
+
+
/* if realloc() fails, array_alloc return NULL. otherwise return pointer to elem pos in array */
void *
-array_alloc(array * a, unsigned int size, unsigned int pos)
+array_alloc(array * a, size_t size, size_t pos)
{
- unsigned int alloc, pos_plus1 = pos + 1;
- unsigned int aligned = 0;
+ size_t alloc, pos_plus1 = pos + 1;
+ size_t aligned = 0;
char *tmp;
assert(size > 0);
- if (pos_plus1 < pos)
- return NULL;
-
- if (!safemult_uint(size, pos_plus1, &alloc))
+ if (pos_plus1 == 0 || !safemult_sizet(size, pos_plus1, &alloc))
return NULL;
if (a->allocated < alloc) {
aligned = ALIGN_4096U(alloc);
}
}
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
Log(LOG_DEBUG, "array_alloc(): rounded %u to %u bytes.", alloc, aligned);
#endif
return NULL;
alloc = aligned;
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.",
a->allocated, aligned);
#endif
/*return number of initialized ELEMS in a. */
-unsigned int
-array_length(const array * const a, unsigned int membersize)
+size_t
+array_length(const array * const a, size_t membersize)
{
assert(a != NULL);
assert(membersize > 0);
}
-/* return false if we could not append src (realloc failure, invalid src/dest array) */
+/* return false on failure (realloc failure, invalid src/dest array) */
bool
-array_copyb(array * dest, const char *src, unsigned int len)
+array_copyb(array * dest, const char *src, size_t len)
{
assert(dest != NULL);
assert(src != NULL );
- if (!len || !src)
- return true;
-
- if (!array_alloc(dest, 1, len))
+ if (!src || !dest)
return false;
- dest->used = len;
- memcpy(dest->mem, src, len);
-#ifdef DEBUG
- Log(LOG_DEBUG,
- "array_copyb(): copied %u bytes to array (%u bytes allocated).",
- len, dest->allocated);
-#endif
- return true;
+ array_trunc(dest);
+ return array_catb(dest, src, len);
}
/* append len bytes from src to the array dest.
return false if we could not append all bytes (realloc failure, invalid src/dest array) */
bool
-array_catb(array * dest, const char *src, unsigned int len)
+array_catb(array * dest, const char *src, size_t len)
{
- unsigned int tmp;
- unsigned int used;
+ size_t tmp;
+ size_t used;
char *ptr;
assert(dest != NULL);
assert(ptr != NULL);
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
Log(LOG_DEBUG,
"array_catb(): appending %u bytes to array (now %u bytes in array).",
len, tmp);
}
+/* append trailing NUL byte to array, but do not count it. */
+bool
+array_cat0_temporary(array * a)
+{
+ char *endpos = array_alloc(a, 1, array_bytes(a));
+ if (!endpos)
+ return false;
+
+ *endpos = '\0';
+ return true;
+}
+
/* add contents of array src to array dest. */
bool
array_cat(array * dest, const array * const src)
return NULL if the array is unallocated, or if pos is larger than
the number of elements stored int the array. */
void *
-array_get(array * a, unsigned int membersize, unsigned int pos)
+array_get(array * a, size_t membersize, size_t pos)
{
- unsigned int totalsize;
+ 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_uint(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);
}
-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)
{
void
-array_truncate(array * a, unsigned int membersize, unsigned int len)
+array_truncate(array * a, size_t membersize, size_t len)
{
- unsigned int newlen;
+ size_t newlen;
assert(a != NULL);
- if (!safemult_uint(membersize, len, &newlen))
+ if (!safemult_sizet(membersize, len, &newlen))
return;
if (newlen <= a->allocated)
/* move elements starting at pos to beginning of array */
void
-array_moveleft(array * a, unsigned int membersize, unsigned int pos)
+array_moveleft(array * a, size_t membersize, size_t pos)
{
- unsigned int bytepos;
+ size_t bytepos;
assert(a != NULL);
assert(membersize > 0);
- if (!pos)
- return;
-
- if (!safemult_uint(membersize, pos, &bytepos)) {
+ if (!safemult_sizet(membersize, pos, &bytepos)) {
a->used = 0;
return;
}
if (!bytepos)
return; /* nothing to do */
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
Log(LOG_DEBUG,
"array_moveleft(): %u bytes used in array, starting at position %u.",
a->used, bytepos);
projects / ngircd-alex.git / blobdiff