===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/roaming_common.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/ssh/Attic/roaming_common.c	2009/05/28 16:50:16	1.1
+++ src/usr.bin/ssh/Attic/roaming_common.c	2009/06/12 20:43:22	1.2
@@ -55,9 +55,9 @@
 }
 
 void
-roam_set_bytes(u_int64_t sent, u_int64_t recv)
+roam_set_bytes(u_int64_t sent, u_int64_t recvd)
 {
-	read_bytes = recv;
+	read_bytes = recvd;
 	write_bytes = sent;
 }
 
@@ -70,7 +70,7 @@
 	if (ret > 0 && !resume_in_progress) {
 		write_bytes += ret;
 	}
-	debug("Wrote %d bytes for a total of %lld", ret, write_bytes);
+	debug("Wrote %ld bytes for a total of %lld", (long)ret, write_bytes);
 	return ret;
 }
 
@@ -86,12 +86,13 @@
 	return ret;
 }
 
-ssize_t
-roaming_atomicio(ssize_t(*f)(), int fd, void *buf, size_t count)
+size_t
+roaming_atomicio(ssize_t(*f)(int, void*, size_t), int fd, void *buf,
+    size_t count)
 {
-	ssize_t ret = atomicio(f, fd, buf, count);
+	size_t ret = atomicio(f, fd, buf, count);
 
-	if ((f == write || f == vwrite) && ret > 0 && !resume_in_progress) {
+	if (f == vwrite && ret > 0 && !resume_in_progress) {
 		write_bytes += ret;
 	} else if (f == read && ret > 0 && !resume_in_progress) {
 		read_bytes += ret;