array: remove check for allocated == 0

[ngircd-alex.git] / src / ngircd / array.c

diff --git a/src/ngircd/array.c b/src/ngircd/array.c
index 041cc8271880c13d8387427bd21f08c48a4eefd8..0fa960857dda156fe1ee8eeaf7ae8ec4040403c6 100644 (file)
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -12,8 +12,6 @@
 
 #include "array.h"
 
-static char UNUSED id[] = "$Id: array.c,v 1.10 2006/05/09 17:02:40 fw Exp $";
-
 #include <assert.h>
 
 #include <stdlib.h>
@@ -26,19 +24,11 @@ static char UNUSED id[] = "$Id: array.c,v 1.10 2006/05/09 17:02:40 fw Exp $";
 
 
 
-#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 array_UNUSABLE(x)      ( !(x)->mem )
 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;
@@ -56,62 +46,37 @@ array_init(array *a)
        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, 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
                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);
 }
 
@@ -126,6 +91,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;
 }
 
@@ -137,6 +103,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);
 }
 
@@ -252,20 +219,22 @@ void *
 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;
 }
 
 
@@ -273,7 +242,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);
@@ -284,17 +253,15 @@ array_free(array * a)
        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)
 {
@@ -333,9 +300,6 @@ array_moveleft(array * a, size_t membersize, size_t pos)
        assert(a != NULL);
        assert(membersize > 0);
 
-       if (!pos)
-               return;
-
        if (!safemult_sizet(membersize, pos, &bytepos)) {
                a->used = 0;
                return;