diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-16 12:31:48 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-16 12:31:48 +1000 |
commit | 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch) | |
tree | 443665fb58916f33c2f346aa3284a444d3352311 /atomicio.c | |
parent | a664e870f27e6dc2c73f393e95a229abc527e0e6 (diff) |
- 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/atomicio.c b/atomicio.c index 1299e5bf7..3f12344ea 100644 --- a/atomicio.c +++ b/atomicio.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$Id: atomicio.c,v 1.10 2000/03/17 12:40:15 damien Exp $"); | 27 | RCSID("$Id: atomicio.c,v 1.11 2000/04/16 02:31:49 damien Exp $"); |
28 | 28 | ||
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
30 | #include "ssh.h" | 30 | #include "ssh.h" |
@@ -43,7 +43,7 @@ atomicio(f, fd, _s, n) | |||
43 | ssize_t res, pos = 0; | 43 | ssize_t res, pos = 0; |
44 | 44 | ||
45 | while (n > pos) { | 45 | while (n > pos) { |
46 | res = (f) (fd, (char*)s + pos, n - pos); | 46 | res = (f) (fd, s + pos, n - pos); |
47 | switch (res) { | 47 | switch (res) { |
48 | case -1: | 48 | case -1: |
49 | if (errno == EINTR || errno == EAGAIN) | 49 | if (errno == EINTR || errno == EAGAIN) |