1 files changed, 12 insertions, 6 deletions

diff --git a/src/daemon/https/tls/gnutls_compress_int.c b/src/daemon/https/tls/gnutls_compress_int.c
index 6b97fac4..07ffd5e1 100644
--- a/src/daemon/https/tls/gnutls_compress_int.c
+++ b/src/daemon/https/tls/gnutls_compress_int.c
@@ -52,6 +52,7 @@ MHD_gtls_comp_init (enum MHD_GNUTLS_CompressionMethod method, int d)
       {
         int window_bits, mem_level;
         int comp_level;
+        int err;
         z_stream *zhandle;
 
         window_bits = MHD_gtls_compression_get_wbits (method);
@@ -73,12 +74,10 @@ MHD_gtls_comp_init (enum MHD_GNUTLS_CompressionMethod method, int d)
 
         if (d)
           err = inflateInit2 (zhandle, window_bits);
-        else
-          {
-            err = deflateInit2 (zhandle,
-                                comp_level, Z_DEFLATED,
-                                window_bits, mem_level, Z_DEFAULT_STRATEGY);
-          }
+        else          
+          err = deflateInit2 (zhandle,
+                              comp_level, Z_DEFLATED,
+                              window_bits, mem_level, Z_DEFAULT_STRATEGY);          
         if (err != Z_OK)
           {
             MHD_gnutls_assert ();
@@ -90,6 +89,9 @@ MHD_gtls_comp_init (enum MHD_GNUTLS_CompressionMethod method, int d)
 #endif
     case MHD_GNUTLS_COMP_NULL:
       break;
+    default:
+      /* not supported! */
+      goto cleanup_ret;
     }
   return ret;
 
@@ -109,6 +111,7 @@ MHD_gtls_comp_deinit (comp_hd_t handle, int d)
       switch (handle->algo)
         {
 #ifdef HAVE_LIBZ
+          int err;
         case MHD_GNUTLS_COMP_DEFLATE:
           if (d)
             err = inflateEnd (handle->handle);
@@ -151,6 +154,7 @@ MHD_gtls_compress (comp_hd_t handle, const opaque * plain,
       {
         uLongf size;
         z_stream *zhandle;
+        int err;
 
         size = (plain_size + plain_size) + 10;
         *compressed = MHD_gnutls_malloc (size);
@@ -230,8 +234,10 @@ MHD_gtls_decompress (comp_hd_t handle, opaque * compressed,
 #ifdef HAVE_LIBZ
     case MHD_GNUTLS_COMP_DEFLATE:
       {
+        int err;
         uLongf out_size;
         z_stream *zhandle;
+        unsigned int cur_pos;
 
         *plain = NULL;
         out_size = compressed_size + compressed_size;