===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/progressmeter.c,v
retrieving revision 1.26.2.1
retrieving revision 1.27
diff -u -r1.26.2.1 -r1.27
--- src/usr.bin/ssh/progressmeter.c	2006/09/30 04:06:51	1.26.2.1
+++ src/usr.bin/ssh/progressmeter.c	2006/03/19 18:51:18	1.27
@@ -1,4 +1,3 @@
-/* $OpenBSD: progressmeter.c,v 1.26.2.1 2006/09/30 04:06:51 brad Exp $ */
 /*
  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
  *
@@ -23,16 +22,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include "includes.h"
+
 #include <sys/ioctl.h>
-#include <sys/uio.h>
 
-#include <errno.h>
 #include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -162,7 +156,7 @@
 			len = 0;
 		if (len >= file_len + 1)
 			len = file_len;
-		for (i = len; i < file_len; i++)
+		for (i = len;  i < file_len; i++ )
 			buf[i] = ' ';
 		buf[file_len] = '\0';
 	}
@@ -223,7 +217,6 @@
 	last_update = now;
 }
 
-/*ARGSUSED*/
 static void
 update_progress_meter(int ignore)
 {
@@ -278,7 +271,6 @@
 	atomicio(vwrite, STDOUT_FILENO, "\n", 1);
 }
 
-/*ARGSUSED*/
 static void
 sig_winch(int sig)
 {