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 ad4f8dac7cda4a57fd5f57a4901829872900e4ac..4cc793f18c02b3f4bea6dd1f46ed2914441740a5 100644 (file)
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -14,16 +14,19 @@
  * Functions to dynamically allocate arrays.
  */
 
+/* Additionan debug messages related to array handling: 0=off / 1=on */
+#define DEBUG_ARRAY 0
+
 #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 */
+#if DEBUG_ARRAY
+# include "log.h"
+#endif
 
 #define array_UNUSABLE(x)      ( !(x)->mem )
 
@@ -64,7 +67,7 @@ array_alloc(array * a, size_t size, size_t pos)
                return NULL;
 
        if (a->allocated < alloc) {
-#ifdef DEBUG_ARRAY
+#if DEBUG_ARRAY
                Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.",
                    a->allocated, alloc);
 #endif
@@ -165,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);
@@ -245,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);
@@ -311,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);