summaryrefslogtreecommitdiff
path: root/progressmeter.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-22 12:56:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-22 12:56:01 +1000
commit3f9fdc71219d498a996c4e4ca8330df7f598fb5d (patch)
tree902072deed2ca26a5b0b3fa5f3749783e0bd62e6 /progressmeter.c
parentb357afc0a03a4238a01acf5d9641ebda9f71d500 (diff)
- avsm@cvs.openbsd.org 2004/06/21 17:36:31
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c sshpty.c] make ssh -Wshadow clean, no functional changes markus@ ok There are also some portable-specific -Wshadow warnings to be fixed in monitor.c and montior_wrap.c.
Diffstat (limited to 'progressmeter.c')
-rw-r--r--progressmeter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/progressmeter.c b/progressmeter.c
index e74f4785f..629a536b2 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: progressmeter.c,v 1.20 2004/05/11 19:01:43 deraadt Exp $"); 26RCSID("$OpenBSD: progressmeter.c,v 1.21 2004/06/21 17:36:31 avsm Exp $");
27 27
28#include "progressmeter.h" 28#include "progressmeter.h"
29#include "atomicio.h" 29#include "atomicio.h"
@@ -224,7 +224,7 @@ update_progress_meter(int ignore)
224} 224}
225 225
226void 226void
227start_progress_meter(char *f, off_t filesize, off_t *stat) 227start_progress_meter(char *f, off_t filesize, off_t *ctr)
228{ 228{
229 struct winsize winsize; 229 struct winsize winsize;
230 230
@@ -232,7 +232,7 @@ start_progress_meter(char *f, off_t filesize, off_t *stat)
232 file = f; 232 file = f;
233 end_pos = filesize; 233 end_pos = filesize;
234 cur_pos = 0; 234 cur_pos = 0;
235 counter = stat; 235 counter = ctr;
236 stalled = 0; 236 stalled = 0;
237 bytes_per_second = 0; 237 bytes_per_second = 0;
238 238