From 55e7f0486a15b08122fffb22e38c71be15ef2986 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Mon, 21 Oct 2013 22:50:52 +0800
Subject: [PATCH] Fix shadowed "ret" variable
--HG--
branch : ecc
---
random.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/random.c b/random.c
index 88c83279..bbe84b55 100644
--- a/random.c
+++ b/random.c
@@ -81,14 +81,14 @@ process_file(hash_state *hs, const char *filename,
unsigned char readbuf[4096];
if (!already_blocked)
{
- int ret;
+ int res;
struct timeval timeout = { .tv_sec = 2, .tv_usec = 0};
fd_set read_fds;
FD_ZERO(&read_fds);
FD_SET(readfd, &read_fds);
- ret = select(readfd + 1, &read_fds, NULL, NULL, &timeout);
- if (ret == 0)
+ res = select(readfd + 1, &read_fds, NULL, NULL, &timeout);
+ if (res == 0)
{
dropbear_log(LOG_WARNING, "Warning: Reading the randomness source '%s' seems to have blocked.\nYou may need to find a better entropy source.", filename);
already_blocked = 1;
--
GitLab