Streamline DEBUG_ARRAY, DEBUG_BUFFER, DEBUG_IO, DEBUG_ZIP

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

diff --git a/src/ngircd/array.c b/src/ngircd/array.c
index d26d5e39b15874e1eb147da24fd01954e5cdd1c4..4cc793f18c02b3f4bea6dd1f46ed2914441740a5 100644 (file)
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -5,32 +5,30 @@
  * (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.14 2006/12/28 12:53:41 alex 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
@@ -61,7 +59,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 +67,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
+#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);
 }
 
@@ -121,6 +97,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 +109,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);
 }
 
@@ -190,7 +168,7 @@ array_catb(array * dest, const char *src, size_t len)
 
        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);
@@ -270,7 +248,7 @@ void
 array_free(array * a)
 {
        assert(a != NULL);
-#ifdef DEBUG_ARRAY
+#if DEBUG_ARRAY
        Log(LOG_DEBUG,
            "array_free(): %u bytes free'd (%u bytes still used at time of free()).",
            a->allocated, a->used);
@@ -281,6 +259,14 @@ array_free(array * a)
        a->used = 0;
 }
 
+void
+array_free_wipe(array *a)
+{
+       size_t bytes = a->allocated;
+       if (bytes)
+               memset(a->mem, 0, bytes);
+       array_free(a);
+}
 
 void *
 array_start(const array * const a)
@@ -328,7 +314,7 @@ array_moveleft(array * a, size_t membersize, size_t pos)
        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);