diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-17 23:40:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-17 23:40:15 +1100 |
commit | 7684ee17ee96426970c00cb44d9d00b6611b9a57 (patch) | |
tree | cb447b6e9d3fdc10b3e66a90b198092d7245447a /atomicio.c | |
parent | d6121d2972c1a6924f6d186ea04eefe9dab774ef (diff) |
- OpenBSD CVS updates:
- [atomicio.c auth-krb4.c bufaux.c channels.c compress.c fingerprint.c]
[packet.h radix.c rsa.c scp.c ssh-agent.c ssh-keygen.c sshconnect.c]
[sshd.c]
pedantic: signed vs. unsigned, void*-arithm, etc
- [ssh.1 sshd.8]
Various cleanups and standardizations.
Diffstat (limited to 'atomicio.c')
-rw-r--r-- | atomicio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/atomicio.c b/atomicio.c index d6797ec73..1299e5bf7 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.9 2000/03/09 10:27:50 damien Exp $"); | 27 | RCSID("$Id: atomicio.c,v 1.10 2000/03/17 12:40:15 damien Exp $"); |
28 | 28 | ||
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
30 | #include "ssh.h" | 30 | #include "ssh.h" |
@@ -33,12 +33,13 @@ RCSID("$Id: atomicio.c,v 1.9 2000/03/09 10:27:50 damien Exp $"); | |||
33 | * ensure all of data on socket comes through. f==read || f==write | 33 | * ensure all of data on socket comes through. f==read || f==write |
34 | */ | 34 | */ |
35 | ssize_t | 35 | ssize_t |
36 | atomicio(f, fd, s, n) | 36 | atomicio(f, fd, _s, n) |
37 | ssize_t (*f) (); | 37 | ssize_t (*f) (); |
38 | int fd; | 38 | int fd; |
39 | void *s; | 39 | void *_s; |
40 | size_t n; | 40 | size_t n; |
41 | { | 41 | { |
42 | char *s = _s; | ||
42 | ssize_t res, pos = 0; | 43 | ssize_t res, pos = 0; |
43 | 44 | ||
44 | while (n > pos) { | 45 | while (n > pos) { |