X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Farray.c;h=ad4f8dac7cda4a57fd5f57a4901829872900e4ac;hp=1e56b719cd4fabc74de4326959790d68805383ca;hb=b5faf3055b61afaef73ac49a448cac1a5b063127;hpb=ef3327d372c159bd2a395d6854843982a5e9c54d

diff --git a/src/ngircd/array.c b/src/ngircd/array.c
index 1e56b719..ad4f8dac 100644
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -5,17 +5,18 @@
  * (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.15 2007/11/18 15:05:35 alex Exp $";
+#include "array.h"
 
 #include <assert.h>
-
 #include <stdlib.h>
 #include <string.h>
 
@@ -24,13 +25,7 @@ static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";
 /* Enable more Debug messages in alloc / append / memmove code. */
 /* #define DEBUG_ARRAY */
 
-
-
-#define array_UNUSABLE(x)	( !(x)->mem || (0 == (x)->allocated) )
-
-#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))
+#define array_UNUSABLE(x)	( !(x)->mem )
 
 
 static bool
@@ -61,7 +56,6 @@ void *
 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);
@@ -70,43 +64,22 @@ array_alloc(array * a, size_t size, size_t pos)
 		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
 		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);
 }
 
@@ -121,6 +94,7 @@ array_length(const array * const a, size_t membersize)
 	if (array_UNUSABLE(a))
 		return 0;
 
+	assert(a->allocated);
 	return membersize ? a->used / membersize : 0;
 }
 
@@ -132,6 +106,7 @@ array_copy(array * dest, const array * const src)
 	if (array_UNUSABLE(src))
 		return false;
 
+	assert(src->allocated);
 	return array_copyb(dest, src->mem, src->used);
 }