[GNUnet-SVN] [gnurl] 179/254: mbedtls: fix variable shadow warning

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.1
in repository gnurl.

commit 35e9281ef8ac394b7d718cf6bd65bdc2ff8047b0
Author: Jay Satiro <address@hidden>
AuthorDate: Mon May 29 17:38:33 2017 -0400

    mbedtls: fix variable shadow warning
    
    vtls/mbedtls.c:804:69: warning: declaration of 'entropy' shadows a global 
declaration [-Wshadow]
     CURLcode Curl_mbedtls_random(struct Curl_easy *data, unsigned char 
*entropy,
                                                                         ^~~~~~~
---
 lib/vtls/mbedtls.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 30f614e80..e7359340d 100644
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -67,7 +67,7 @@
 #endif
 
 #if defined(THREADING_SUPPORT)
-static mbedtls_entropy_context entropy;
+static mbedtls_entropy_context ts_entropy;
 
 static int entropy_init_initialized = 0;
 
@@ -247,11 +247,11 @@ mbed_connect_step1(struct connectdata *conn,
   }
 
 #ifdef THREADING_SUPPORT
-  entropy_init_mutex(&entropy);
+  entropy_init_mutex(&ts_entropy);
   mbedtls_ctr_drbg_init(&connssl->ctr_drbg);
 
   ret = mbedtls_ctr_drbg_seed(&connssl->ctr_drbg, entropy_func_mutex,
-                              &entropy, NULL, 0);
+                              &ts_entropy, NULL, 0);
   if(ret) {
 #ifdef MBEDTLS_ERROR_C
     mbedtls_strerror(ret, errorbuf, sizeof(errorbuf));

-- 
To stop receiving notification emails like this one, please contact
address@hidden