From: Matt Caswell <matt@openssl.org>
Date: Thu, 20 Oct 2016 23:00:40 +0000 (+0100)
Subject: Fix a shadowed variable declaration warning
X-Git-Tag: OpenSSL_1_1_1-pre1~3318
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ac0edec108804c383e1f7c48dd2fe72deecf6f9c;p=oweals%2Fopenssl.git

Fix a shadowed variable declaration warning

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index e06c580871..af5f913d8f 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -88,7 +88,7 @@ static int ssl_free(BIO *a)
     return 1;
 }
 
-static int ssl_read(BIO *b, char *out, size_t outl, size_t *read)
+static int ssl_read(BIO *b, char *out, size_t outl, size_t *readbytes)
 {
     int ret = 1;
     BIO_SSL *sb;
@@ -108,14 +108,14 @@ static int ssl_read(BIO *b, char *out, size_t outl, size_t *read)
 
     ret = SSL_read(ssl, out, outl);
     if (ret > 0)
-        *read = ret;
+        *readbytes = ret;
 
     switch (SSL_get_error(ssl, ret)) {
     case SSL_ERROR_NONE:
         if (ret <= 0)
             break;
         if (sb->renegotiate_count > 0) {
-            sb->byte_count += *read;
+            sb->byte_count += *readbytes;
             if (sb->byte_count > sb->renegotiate_count) {
                 sb->byte_count = 0;
                 sb->num_renegotiates++;