Fix a shadowed variable declaration warning picked up by Travis

Rename "read" to "readbytes"

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 29ce67555fe8ff30ccd9cef6dfb6e56d27e6c603..d2bb67832307590961ee8c8ec4a6c75132df1613 100644 (file)
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -336,7 +336,7 @@ int dtls1_process_buffered_records(SSL *s)
  *             none of our business
  */
 int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
  *             none of our business
  */
 int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,

-                     size_t len, int peek, size_t *read)
+                     size_t len, int peek, size_t *readbytes)

 {
     int al, i, j, iret;
     size_t ret, n;
 {
     int al, i, j, iret;
     size_t ret, n;


@@ -362,7 +362,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
     ret = have_handshake_fragment(s, type, buf, len);
     if (ret > 0) {
         *recvd_type = SSL3_RT_HANDSHAKE;
     ret = have_handshake_fragment(s, type, buf, len);
     if (ret > 0) {
         *recvd_type = SSL3_RT_HANDSHAKE;

-        *read = ret;
+        *readbytes = ret;

         return 1;
     }
 
         return 1;
     }
 


@@ -548,7 +548,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
             return 0;
         }
 #endif
             return 0;
         }
 #endif

-        *read = n;
+        *readbytes = n;

         return 1;
     }
 
         return 1;
     }