Don't play games with FILE* stdin/out/err, only touch "real" descriptors.

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

diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c
index 4f5efaad90d3fe4733aa6f9b64732fb241f394a4..be65e969d8a354f01b8a81bd78b1ae53b87b5ed5 100644 (file)
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -14,12 +14,12 @@
 
 #include "portab.h"
 
-#define __conn_zip_c__
+#define CONN_MODULE
 
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 
-static char UNUSED id[] = "$Id: conn-zip.c,v 1.1 2002/12/30 16:07:23 alex Exp $";
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.5 2004/04/25 13:55:36 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -27,6 +27,7 @@ static char UNUSED id[] = "$Id: conn-zip.c,v 1.1 2002/12/30 16:07:23 alex Exp $"
 #include <zlib.h>
 
 #include "conn.h"
+#include "conn-func.h"
 #include "log.h"
 
 #include "exp.h"
@@ -113,9 +114,9 @@ Zip_Flush( CONN_ID Idx )
 
        out = &My_Connections[Idx].zip.out;
 
-       out->next_in = My_Connections[Idx].zip.wbuf;
+       out->next_in = (VOID *)My_Connections[Idx].zip.wbuf;
        out->avail_in = My_Connections[Idx].zip.wdatalen;
-       out->next_out = My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen;
+       out->next_out = (VOID *)(My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen);
        out->avail_out = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen;
 
        result = deflate( out, Z_SYNC_FLUSH );
@@ -152,15 +153,15 @@ Unzip_Buffer( CONN_ID Idx )
 
        in = &My_Connections[Idx].zip.in;
 
-       in->next_in = My_Connections[Idx].zip.rbuf;
+       in->next_in = (VOID *)My_Connections[Idx].zip.rbuf;
        in->avail_in = My_Connections[Idx].zip.rdatalen;
-       in->next_out = My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen;
+       in->next_out = (VOID *)(My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen);
        in->avail_out = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1;
 
        result = inflate( in, Z_SYNC_FLUSH );
        if( result != Z_OK )
        {
-               Log( LOG_ALERT, "Decompression error: code %d (ni=%d, ai=%d, no=%d, ao=%d)!?", result, in->next_in, in->avail_in, in->next_out, in->avail_out );
+               Log( LOG_ALERT, "Decompression error: %s (code=%d, ni=%d, ai=%d, no=%d, ao=%d)!?", in->msg, result, in->next_in, in->avail_in, in->next_out, in->avail_out );
                Conn_Close( Idx, "Decompression error!", NULL, FALSE );
                return FALSE;
        }