summaryrefslogtreecommitdiff
path: root/atomicio.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-16 12:31:48 +1000
committerDamien Miller <djm@mindrot.org>2000-04-16 12:31:48 +1000
commit5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch)
tree443665fb58916f33c2f346aa3284a444d3352311 /atomicio.c
parenta664e870f27e6dc2c73f393e95a229abc527e0e6 (diff)
downloadopenssh-git-5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7.tar.gz
- Reduce diff against OpenBSD source
- All OpenSSL includes are now unconditionally referenced as openssl/foo.h - Pick up formatting changes - Other minor changed (typecasts, etc) that I missed
Diffstat (limited to 'atomicio.c')
-rw-r--r--atomicio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/atomicio.c b/atomicio.c
index 1299e5bf..3f12344e 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-RCSID("$Id: atomicio.c,v 1.10 2000/03/17 12:40:15 damien Exp $");
+RCSID("$Id: atomicio.c,v 1.11 2000/04/16 02:31:49 damien Exp $");
#include "xmalloc.h"
#include "ssh.h"
@@ -43,7 +43,7 @@ atomicio(f, fd, _s, n)
ssize_t res, pos = 0;
while (n > pos) {
- res = (f) (fd, (char*)s + pos, n - pos);
+ res = (f) (fd, s + pos, n - pos);
switch (res) {
case -1:
if (errno == EINTR || errno == EAGAIN)