The branch master has been updated via d2b53fcdef9e7b482ff1e2d5f305ae798f3d1be2 (commit) from a9998e2f67046d3f778d3c9d578ea56e183a638b (commit)
- Log ----------------------------------------------------------------- commit d2b53fcdef9e7b482ff1e2d5f305ae798f3d1be2 Author: Richard Levitte <levi...@openssl.org> Date: Fri Feb 17 14:31:51 2017 +0100 Fix symbol shadow Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2663) ----------------------------------------------------------------------- Summary of changes: crypto/mem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/mem.c b/crypto/mem.c index 16558ac..aae92d4 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -117,16 +117,16 @@ static void parseit(void) static int shouldfail(void) { int roll = (int)(random() % 100); - int shouldfail = roll < md_fail_percent; + int shoulditfail = roll < md_fail_percent; char buff[80]; if (md_tracefd > 0) { BIO_snprintf(buff, sizeof(buff), "%c C%ld %%%d R%d\n", - shouldfail ? '-' : '+', md_count, md_fail_percent, roll); + shoulditfail ? '-' : '+', md_count, md_fail_percent, roll); write(md_tracefd, buff, strlen(buff)); #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE - if (shouldfail) { + if (shoulditfail) { void *addrs[30]; int num = backtrace(addrs, OSSL_NELEM(addrs)); @@ -141,7 +141,7 @@ static int shouldfail(void) parseit(); } - return shouldfail; + return shoulditfail; } void ossl_malloc_setup_failures(void) _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits