diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-01-14 13:54:13 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-15 02:22:18 +1100 |
commit | 7d845f4a0b7ec97887be204c3760e44de8bf1f32 (patch) | |
tree | c7f7271203627c22594cc86381745acce479d250 /progressmeter.c | |
parent | 139ca81866ec1b219c717d17061e5e7ad1059e2a (diff) |
upstream commit
update sftp client and server to new buffer API. pretty
much just mechanical changes; with & ok markus
Diffstat (limited to 'progressmeter.c')
-rw-r--r-- | progressmeter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/progressmeter.c b/progressmeter.c index bbbc7066b..319b7470a 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: progressmeter.c,v 1.40 2013/09/19 00:24:52 djm Exp $ */ | 1 | /* $OpenBSD: progressmeter.c,v 1.41 2015/01/14 13:54:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2003 Nils Nordman. All rights reserved. | 3 | * Copyright (c) 2003 Nils Nordman. All rights reserved. |
4 | * | 4 | * |
@@ -65,7 +65,7 @@ static void update_progress_meter(int); | |||
65 | 65 | ||
66 | static time_t start; /* start progress */ | 66 | static time_t start; /* start progress */ |
67 | static time_t last_update; /* last progress update */ | 67 | static time_t last_update; /* last progress update */ |
68 | static char *file; /* name of the file being transferred */ | 68 | static const char *file; /* name of the file being transferred */ |
69 | static off_t start_pos; /* initial position of transfer */ | 69 | static off_t start_pos; /* initial position of transfer */ |
70 | static off_t end_pos; /* ending position of transfer */ | 70 | static off_t end_pos; /* ending position of transfer */ |
71 | static off_t cur_pos; /* transfer position as of last refresh */ | 71 | static off_t cur_pos; /* transfer position as of last refresh */ |
@@ -248,7 +248,7 @@ update_progress_meter(int ignore) | |||
248 | } | 248 | } |
249 | 249 | ||
250 | void | 250 | void |
251 | start_progress_meter(char *f, off_t filesize, off_t *ctr) | 251 | start_progress_meter(const char *f, off_t filesize, off_t *ctr) |
252 | { | 252 | { |
253 | start = last_update = monotime(); | 253 | start = last_update = monotime(); |
254 | file = f; | 254 | file = f; |