From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 27 Mar 2010 23:28:09 +0000 (+0000)
Subject: PR: 1763
X-Git-Tag: OpenSSL-fips-2_0-rc1~1166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ac75e21a1ca44ae14514c81f5c21eea8083eff9;p=oweals%2Fopenssl.git

PR: 1763

Remove useless num = 0 assignment.

Remove redundant cases on sock_ctrl(): default case handles them.
---

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 30c3ceab46..3df31938c1 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -172,15 +172,6 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 	switch (cmd)
 		{
-	case BIO_CTRL_RESET:
-		num=0;
-	case BIO_C_FILE_SEEK:
-		ret=0;
-		break;
-	case BIO_C_FILE_TELL:
-	case BIO_CTRL_INFO:
-		ret=0;
-		break;
 	case BIO_C_SET_FD:
 		sock_free(b);
 		b->num= *((int *)ptr);
@@ -203,10 +194,6 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
 	case BIO_CTRL_SET_CLOSE:
 		b->shutdown=(int)num;
 		break;
-	case BIO_CTRL_PENDING:
-	case BIO_CTRL_WPENDING:
-		ret=0;
-		break;
 	case BIO_CTRL_DUP:
 	case BIO_CTRL_FLUSH:
 		ret=1;