Fix shadowed "ret" variable

--HG--
branch : ecc
This commit is contained in:
Matt Johnston 2013-10-21 22:50:52 +08:00
parent 88ac2da7c2
commit 55e7f0486a

View File

@ -81,14 +81,14 @@ process_file(hash_state *hs, const char *filename,
unsigned char readbuf[4096]; unsigned char readbuf[4096];
if (!already_blocked) if (!already_blocked)
{ {
int ret; int res;
struct timeval timeout = { .tv_sec = 2, .tv_usec = 0}; struct timeval timeout = { .tv_sec = 2, .tv_usec = 0};
fd_set read_fds; fd_set read_fds;
FD_ZERO(&read_fds); FD_ZERO(&read_fds);
FD_SET(readfd, &read_fds); FD_SET(readfd, &read_fds);
ret = select(readfd + 1, &read_fds, NULL, NULL, &timeout); res = select(readfd + 1, &read_fds, NULL, NULL, &timeout);
if (ret == 0) 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); 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; already_blocked = 1;