From 3fd019ecca7d41702111f926f08e370946cf9060 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 15 Mar 2006 11:29:51 +1100
Subject: [PATCH]    - otto@cvs.openbsd.org 2006/02/11 19:31:18     
 [atomicio.c]      type correctness; from Ray Lai in PR 5011; ok millert@

---
 ChangeLog  | 5 ++++-
 atomicio.c | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6ddb879d..70cd90426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,9 @@
      [includes.h monitor.c readpass.c scp.c serverloop.c session.c]
      [sftp.c sshconnect.c sshconnect2.c sshd.c]
      move #include <sys/wait.h> out of includes.h; ok markus@
+   - otto@cvs.openbsd.org 2006/02/11 19:31:18
+     [atomicio.c]
+     type correctness; from Ray Lai in PR 5011; ok millert@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3967,4 +3970,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4158 2006/03/15 00:29:24 djm Exp $
+$Id: ChangeLog,v 1.4159 2006/03/15 00:29:51 djm Exp $
diff --git a/atomicio.c b/atomicio.c
index 12abbda16..8dd271b6d 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: atomicio.c,v 1.13 2005/05/24 17:32:43 avsm Exp $");
+RCSID("$OpenBSD: atomicio.c,v 1.14 2006/02/11 19:31:18 otto Exp $");
 
 #include "atomicio.h"
 
@@ -58,7 +58,7 @@ atomicio(f, fd, _s, n)
 			errno = EPIPE;
 			return pos;
 		default:
-			pos += (u_int)res;
+			pos += (size_t)res;
 		}
 	}
 	return (pos);