From: Andy Polyakov <appro@openssl.org>
Date: Sun, 1 Jul 2012 09:12:03 +0000 (+0000)
Subject: bss_dgram.c: fix typos in Windows code [from HEAD].
X-Git-Tag: OpenSSL_1_0_2-beta1~606
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae414a0e429f4445b76bc1cfdee15eb65a81280f;p=oweals%2Fopenssl.git

bss_dgram.c: fix typos in Windows code [from HEAD].
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 0d3c1cf342..3b251ba8d8 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -278,7 +278,7 @@ static void dgram_adjust_rcv_timeout(BIO *b)
 
 		sz.i = sizeof(timeout);
 		if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-					   (void*)&timeout, &sz) < 0)
+					   (void*)&timeout, &sz.i) < 0)
 			{ perror("getsockopt"); }
 		else
 			{
@@ -748,7 +748,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 		sz.i = sizeof(timeout);
 		if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-			(void*)&timeout, &sz) < 0)
+			(void*)&timeout, &sz.i) < 0)
 			{ perror("getsockopt"); ret = -1; }
 		else
 			{
@@ -797,7 +797,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 		sz.i = sizeof(timeout);
 		if (getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
-			(void*)&timeout, &sz) < 0)
+			(void*)&timeout, &sz.i) < 0)
 			{ perror("getsockopt"); ret = -1; }
 		else
 			{
@@ -805,7 +805,6 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
 			tv->tv_usec = (timeout % 1000) * 1000;
 			ret = sizeof(*tv);
 			}
-		}
 #else
 		sz.i = sizeof(struct timeval);
 		if ( getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,