minor cleanups.

diff --git a/includes/gnutls/openssl.h b/includes/gnutls/openssl.h
index e9703c9785dd95f37d0e8af295268d1fca05f683..7273d63ae0e44a80debc253ac13a4f2232a03f90 100644 (file)
--- a/includes/gnutls/openssl.h
+++ b/includes/gnutls/openssl.h
@@ -134,7 +134,7 @@ typedef struct _SSL
 
 typedef struct
 {
-    GCRY_MD_HD handle;
+    gcry_md_hd_t handle;
 } MD_CTX;
 
 struct RSA;

diff --git a/lib/gnutls_compress_int.c b/lib/gnutls_compress_int.c
index 216b7f328ad915f93b32a0842efd4e20b2dfdf1f..894d1fd2ad5c5621e3156e7de6bf5010b4df9670 100644 (file)
--- a/lib/gnutls_compress_int.c
+++ b/lib/gnutls_compress_int.c
@@ -68,9 +68,7 @@ int err;
                ret->handle = gnutls_malloc( sizeof( z_stream));
                if (ret->handle==NULL) {
                        gnutls_assert();
-                       cleanup_ret:
-                       gnutls_free(ret);
-                       return NULL;
+                       goto cleanup_ret;
                }
                
                zhandle = ret->handle;
@@ -102,7 +100,9 @@ int err;
                  
                   if (ret->handle==NULL) {
                        gnutls_assert();
-                       goto cleanup_ret;
+                       cleanup_ret:
+                       gnutls_free(ret);
+                       return NULL;
                   }
                }
                

diff --git a/src/tls_test.c b/src/tls_test.c
index 966825f14ace8bf41cab7f4fb26d6a8d1b1a23c8..e8afa3556273b02de4f3727f5c4ee8a9d9af2d1f 100644 (file)
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -198,7 +198,7 @@ int main(int argc, char **argv)
 
                CONNECT();
                gnutls_init(&state, GNUTLS_CLIENT);
-               gnutls_transport_set_ptr(state, sd);
+               gnutls_transport_set_ptr(state, (gnutls_transport_ptr)sd);
 
                printf("Checking %s...", tls_tests[i].test_name);