Safe fixes for compiler warnings.

svn path=/trunk/; revision=3929

2 files changed, 5 insertions, 7 deletions

diff --git a/socket.c b/socket.c
index b8195e5f..15598272 100644
--- a/socket.c
+++ b/socket.c
@@ -898,10 +898,9 @@ static int SSL_ck_verify_callback( int ok_return, X509_STORE_CTX *ctx )
 int SSLOpen(int sock, char *mycert, char *mykey, char *myproto, int certck, char *certpath,
     char *fingerprint, char *servercname, char *label)
 {
-	SSL *ssl;
         struct stat randstat;
         int i;
-	
+
 	SSL_load_error_strings();
 	SSLeay_add_ssl_algorithms();
 	
@@ -1004,7 +1003,7 @@ int SSLOpen(int sock, char *mycert, char *mykey, char *myproto, int certck, char
 	if ((fingerprint != NULL || certck) && !_depth0ck) {
 		report(stderr, GT_("Certificate/fingerprint verification was somehow skipped!\n"));
 		
-		if( NULL != ( ssl = SSLGetContext( sock ) ) ) {
+		if( NULL != SSLGetContext( sock ) ) {
 			/* Clean up the SSL stack */
 			SSL_free( _ssl_context[sock] );
 			_ssl_context[sock] = NULL;
@@ -1020,9 +1019,7 @@ int SockClose(int sock)
 /* close a socket gracefully */
 {
 #ifdef	SSL_ENABLE
-    SSL *ssl;
-
-    if( NULL != ( ssl = SSLGetContext( sock ) ) ) {
+    if( NULL != SSLGetContext( sock ) ) {
         /* Clean up the SSL stack */
         SSL_free( _ssl_context[sock] );
         _ssl_context[sock] = NULL;
diff --git a/transact.c b/transact.c
index 53b80ab8..c246df89 100644
--- a/transact.c
+++ b/transact.c
@@ -379,7 +379,8 @@ int readheaders(int sock,
     int			env_offs;
     char		*received_for, *rcv, *cp;
     static char		*delivered_to = NULL;
-    int 		n, linelen, oldlen, ch, remaining, skipcount;
+    int 		n, oldlen, ch, remaining, skipcount;
+    size_t		linelen;
     struct idlist 	*idp;
     flag		no_local_matches = FALSE;
     flag		has_nuls;