diff options
| author | Anil Madhavapeddy <avsm@cvs.openbsd.org> | 2004-06-21 17:36:32 +0000 |
|---|---|---|
| committer | Anil Madhavapeddy <avsm@cvs.openbsd.org> | 2004-06-21 17:36:32 +0000 |
| commit | 94e40cf48cc652312b2b49c2afd9b70e6a92f7b8 (patch) | |
| tree | f126392af60ab5bb21752a3c84a8da68fc04bd6f /usr.bin/ssh/scp.c | |
| parent | a3660022a0c902fed2c6f55da241879c45acb545 (diff) | |
make ssh -Wshadow clean, no functional changes
markus@ ok
Diffstat (limited to 'usr.bin/ssh/scp.c')
| -rw-r--r-- | usr.bin/ssh/scp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index e330bbb937e..c650b2741fe 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -71,7 +71,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.114 2004/04/01 12:19:57 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.115 2004/06/21 17:36:31 avsm Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -654,7 +654,7 @@ bwlimit(int amount) { static struct timeval bwstart, bwend; static int lamt, thresh = 16384; - u_int64_t wait; + u_int64_t waitlen; struct timespec ts, rm; if (!timerisset(&bwstart)) { @@ -672,10 +672,10 @@ bwlimit(int amount) return; lamt *= 8; - wait = (double)1000000L * lamt / limit_rate; + waitlen = (double)1000000L * lamt / limit_rate; - bwstart.tv_sec = wait / 1000000L; - bwstart.tv_usec = wait % 1000000L; + bwstart.tv_sec = waitlen / 1000000L; + bwstart.tv_usec = waitlen % 1000000L; if (timercmp(&bwstart, &bwend, >)) { timersub(&bwstart, &bwend, &bwend); |