From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 21 Aug 2003 16:50:50 +0000 (+0000)
Subject: minor cleanups.
X-Git-Tag: gnutls_0_9_7~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e2b0abcb0da22d9a6e85ef49a5122f7ea0f255a;p=thirdparty%2Fgnutls.git

minor cleanups.
---

diff --git a/includes/gnutls/openssl.h b/includes/gnutls/openssl.h
index e9703c9785..7273d63ae0 100644
--- 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 216b7f328a..894d1fd2ad 100644
--- 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 966825f14a..e8afa35562 100644
--- 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);