[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  adb4076ae06dd6ff01a62b1fcd73f02aadc5ecae (commit)
      from  68cd4e3f993cf16adf0904a85f5b477a0094c1cf (commit)


- Log -----------------------------------------------------------------
commit adb4076ae06dd6ff01a62b1fcd73f02aadc5ecae
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 4 00:11:20 2016 +0200

    Don't shadow known symbols write, read, puts, gets
    
    It was harmless in this case, but best avoid the annoying warnings.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bio_meth.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index 134c448..88ce8c3 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -76,9 +76,9 @@ int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int)
 }
 
 int BIO_meth_set_write(BIO_METHOD *biom,
-                       int (*write) (BIO *, const char *, int))
+                       int (*bwrite) (BIO *, const char *, int))
 {
-    biom->bwrite = write;
+    biom->bwrite = bwrite;
     return 1;
 }
 
@@ -88,9 +88,9 @@ int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int)
 }
 
 int BIO_meth_set_read(BIO_METHOD *biom,
-                      int (*read) (BIO *, char *, int))
+                      int (*bread) (BIO *, char *, int))
 {
-    biom->bread = read;
+    biom->bread = bread;
     return 1;
 }
 
@@ -100,9 +100,9 @@ int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *)
 }
 
 int BIO_meth_set_puts(BIO_METHOD *biom,
-                      int (*puts) (BIO *, const char *))
+                      int (*bputs) (BIO *, const char *))
 {
-    biom->bputs = puts;
+    biom->bputs = bputs;
     return 1;
 }
 
@@ -112,9 +112,9 @@ int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int)
 }
 
 int BIO_meth_set_gets(BIO_METHOD *biom,
-                      int (*gets) (BIO *, char *, int))
+                      int (*bgets) (BIO *, char *, int))
 {
-    biom->bgets = gets;
+    biom->bgets = bgets;
     return 1;
 }