aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-10-25 23:27:16 +0100
committerMatt Caswell <matt@openssl.org>2016-11-04 12:09:46 +0000
commit02ba18a63e1f4ae1d0c0a185f9b7701fcddc1835 (patch)
treeeb496d16f5653cd9cf269947edfe35cfcaeb2bd3
parent8d2b1819ef66206d19c1b0ecbf3ca882fed04721 (diff)
downloadopenssl-02ba18a63e1f4ae1d0c0a185f9b7701fcddc1835.zip
openssl-02ba18a63e1f4ae1d0c0a185f9b7701fcddc1835.tar.gz
openssl-02ba18a63e1f4ae1d0c0a185f9b7701fcddc1835.tar.bz2
Fix a shadowed variable declaration warning picked up by Travis
Rename "read" to "readbytes" Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--ssl/record/rec_layer_d1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 29ce675..d2bb678 100644
--- 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,
- 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;
@@ -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;
- *read = ret;
+ *readbytes = ret;
return 1;
}
@@ -548,7 +548,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
return 0;
}
#endif
- *read = n;
+ *readbytes = n;
return 1;
}