summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--progressmeter.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 94fe477d3..46333ce13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 [log.c] 7 [log.c]
8 set fatal_cleanups to NULL in fatal_remove_all_cleanups(); 8 set fatal_cleanups to NULL in fatal_remove_all_cleanups();
9 dtucker@zip.com.au 9 dtucker@zip.com.au
10 - markus@cvs.openbsd.org 2003/01/12 16:57:02
11 [progressmeter.c]
12 allow WARNINGS=yes; ok djm@
10 13
1120030113 1420030113
12 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type 15 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
@@ -1010,4 +1013,4 @@
1010 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1013 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1011 ok provos@ 1014 ok provos@
1012 1015
1013$Id: ChangeLog,v 1.2568 2003/01/14 11:22:43 djm Exp $ 1016$Id: ChangeLog,v 1.2569 2003/01/14 11:23:23 djm Exp $
diff --git a/progressmeter.c b/progressmeter.c
index ae13c67e7..e7380a8ff 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -60,11 +60,12 @@
60 */ 60 */
61 61
62#include "includes.h" 62#include "includes.h"
63RCSID("$OpenBSD: progressmeter.c,v 1.1 2003/01/10 08:19:07 fgsch Exp $"); 63RCSID("$OpenBSD: progressmeter.c,v 1.2 2003/01/12 16:57:02 markus Exp $");
64 64
65#include <libgen.h> 65#include <libgen.h>
66 66
67#include "atomicio.h" 67#include "atomicio.h"
68#include "progressmeter.h"
68 69
69/* Number of seconds before xfer considered "stalled". */ 70/* Number of seconds before xfer considered "stalled". */
70#define STALLTIME 5 71#define STALLTIME 5
@@ -81,7 +82,7 @@ static int foregroundproc(void);
81static int get_tty_width(void); 82static int get_tty_width(void);
82 83
83/* Visual statistics about files as they are transferred. */ 84/* Visual statistics about files as they are transferred. */
84static void draw_progress_meter(); 85static void draw_progress_meter(void);
85 86
86/* Time a transfer started. */ 87/* Time a transfer started. */
87static struct timeval start; 88static struct timeval start;