X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Farray.c;h=ff7f02ce27afef98a3115e08b2759bcbaaa16e84;hb=4e56e5341f632827af3810e26cd59ac0c15b642b;hp=25eb680515879d8b69d59130a944866a7a2c883f;hpb=8efeae171431db98f88435a7152e94b1532c3955;p=ngircd-alex.git

diff --git a/src/ngircd/array.c b/src/ngircd/array.c
index 25eb6805..ff7f02ce 100644
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -12,7 +12,7 @@
 
 #include "array.h"
 
-static char UNUSED id[] = "$Id: array.c,v 1.7 2005/08/28 12:18:50 fw Exp $";
+static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";
 
 #include <assert.h>
 
@@ -21,26 +21,24 @@ static char UNUSED id[] = "$Id: array.c,v 1.7 2005/08/28 12:18:50 fw Exp $";
 
 #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) )
 
-	if (!a || !b) {
-		*res = 0;
-		return true;
-	}
+#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))
 
-	tmp = a * b;
 
-	if (tmp / b != a)
+static bool
+safemult_sizet(size_t a, size_t b, size_t *res)
+{
+	size_t tmp = a * b;
+
+	if (b && (tmp / b != a))
 		return false;
 
 	*res = tmp;
@@ -51,27 +49,24 @@ safemult_uint(unsigned int a, unsigned int b, unsigned int *res)
 void
 array_init(array *a)
 {
-	assert(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) {
@@ -84,7 +79,7 @@ array_alloc(array * a, unsigned int size, unsigned int pos)
 				aligned = ALIGN_4096U(alloc);
 			}
 		}
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
 		Log(LOG_DEBUG, "array_alloc(): rounded %u to %u bytes.", alloc, aligned);
 #endif
 
@@ -94,7 +89,7 @@ array_alloc(array * a, unsigned int size, unsigned int pos)
 			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
@@ -117,8 +112,8 @@ array_alloc(array * a, unsigned int size, unsigned int pos)
 
 
 /*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);
@@ -141,27 +136,18 @@ array_copy(array * dest, const array * const src)
 }
 
 
-/* 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);
 }
 
 
@@ -176,10 +162,10 @@ array_copys(array * dest, const char *src)
 /* 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);
@@ -204,7 +190,7 @@ array_catb(array * dest, const char *src, unsigned int len)
 
 	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);
@@ -258,23 +244,25 @@ 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;
 }
 
 
@@ -282,7 +270,7 @@ void
 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);
@@ -294,16 +282,6 @@ array_free(array * a)
 }
 
 
-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)
 {
@@ -321,11 +299,11 @@ array_trunc(array * 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)
@@ -335,17 +313,14 @@ array_truncate(array * a, unsigned int membersize, unsigned int len)
 
 /* 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;
 	}
@@ -353,7 +328,7 @@ array_moveleft(array * a, unsigned int membersize, unsigned int pos)
 	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);