Whitespace fixes (no functional changes)

[ngircd-alex.git] / src / ngircd / conn-zip.c

diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c
index 24577ed525da167eac177528f78594235b580e1a..fe7f2fb0e06ffc169aa1956065eaf30e2021c00c 100644 (file)
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -1,26 +1,28 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Connection compression using ZLIB
  */
 
+#define CONN_MODULE
+
 #include "portab.h"
 
-#define CONN_MODULE
+/**
+ * @file
+ * Connection compression using ZLIB
+ */
 
-#ifdef ZLIB
+/* Additionan debug messages related to ZIP compression: 0=off / 1=on */
+#define DEBUG_ZIP 0
 
-/* enable more zlib related debug messages: */
-/* #define DEBUG_ZLIB */
+#ifdef ZLIB
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <zlib.h>
@@ -28,9 +30,8 @@
 #include "conn.h"
 #include "conn-func.h"
 #include "log.h"
-
 #include "array.h"
-#include "exp.h"
+
 #include "conn-zip.h"
 
 
@@ -105,8 +106,8 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len )
         * otherwise the zip wbuf would grow too large */
        buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
        if (buflen + Len >= WRITEBUFFER_SLINK_LEN) {
-               Log(LOG_ALERT, "Zip Write Buffer overflow: %lu bytes\n", buflen + Len);
-               Conn_Close(Idx, "Zip Write buffer overflow", NULL, false);
+               Log(LOG_ALERT, "Zip Write buffer space exhausted: %lu bytes", buflen + Len);
+               Conn_Close(Idx, "Zip Write buffer space exhausted", NULL, false);
                return false;
        }
        return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
@@ -140,7 +141,7 @@ Zip_Flush( CONN_ID Idx )
        out->next_out = zipbuf;
        out->avail_out = (uInt)sizeof zipbuf;
 
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
        Log(LOG_DEBUG, "out->avail_in %d, out->avail_out %d",
                out->avail_in, out->avail_out);
 #endif
@@ -155,7 +156,7 @@ Zip_Flush( CONN_ID Idx )
        if (out->avail_out <= 0) {
                /* Not all data was compressed, because data became
                 * bigger while compressing it. */
-               Log (LOG_ALERT, "Compression error: buffer overvlow!?");
+               Log(LOG_ALERT, "Compression error: buffer overflow!?");
                Conn_Close(Idx, "Compression error!", NULL, false);
                return false;
        }
@@ -163,7 +164,7 @@ Zip_Flush( CONN_ID Idx )
        assert(out->avail_out <= WRITEBUFFER_SLINK_LEN);
 
        zipbuf_used = WRITEBUFFER_SLINK_LEN - out->avail_out;
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
        Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used);
 #endif
        if (!array_catb(&My_Connections[Idx].wbuf,
@@ -174,7 +175,7 @@ Zip_Flush( CONN_ID Idx )
        }
 
        My_Connections[Idx].bytes_out += zipbuf_used;
-       My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf); 
+       My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf);
        array_trunc(&My_Connections[Idx].zip.wbuf);
 
        return true;
@@ -197,7 +198,7 @@ Unzip_Buffer( CONN_ID Idx )
        int unzipbuf_used = 0;
        unsigned int z_rdatalen;
        unsigned int in_len;
-       
+
        z_stream *in;
 
        assert( Idx > NONE );
@@ -215,7 +216,7 @@ Unzip_Buffer( CONN_ID Idx )
        in->next_out = unzipbuf;
        in->avail_out = (uInt)sizeof unzipbuf;
 
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
        Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d",
                in->avail_in, in->avail_out);
 #endif
@@ -230,7 +231,7 @@ Unzip_Buffer( CONN_ID Idx )
        assert(z_rdatalen >= in->avail_in);
        in_len = z_rdatalen - in->avail_in;
        unzipbuf_used = READBUFFER_LEN - in->avail_out;
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
        Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN,
                in->avail_out, unzipbuf_used);
 #endif