RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-07 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- otto@cvs.openbsd.org 2006/02/11 19:31:18

Browse Source 
[atomicio.c]
     type correctness; from Ray Lai in PR 5011; ok millert@
This commit is contained in:
Damien Miller 2006-03-15 11:29:51 +11:00
parent 9cf6d077fb
commit 3fd019ecca
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 $

4
atomicio.c
View File

@ -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);