[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  71405d683c979178618363b618f527ebdbea7854 (commit)
      from  1918e01c9f915e2eba31a5e2f86f0a5daa4fafb6 (commit)


- Log -----------------------------------------------------------------
commit 71405d683c979178618363b618f527ebdbea7854
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Jan 10 23:28:09 2016 +0000

    fix shadow warning
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/danetest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/danetest.c b/test/danetest.c
index 202be20..02d0f79 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -88,7 +88,7 @@ static int restore_errno(void)
     return ret;
 }
 
-static void usage(void)
+static void test_usage(void)
 {
     fprintf(stderr, "usage: %s: danetest basedomain CAfile tlsafile\n", progname);
 }
@@ -465,7 +465,7 @@ int main(int argc, char *argv[])
 
     progname = argv[0];
     if (argc != 4) {
-        usage();
+        test_usage();
         EXIT(1);
     }
     basedomain = argv[1];