summaryrefslogtreecommitdiff
path: root/atomicio.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-17 23:40:15 +1100
committerDamien Miller <djm@mindrot.org>2000-03-17 23:40:15 +1100
commit7684ee17ee96426970c00cb44d9d00b6611b9a57 (patch)
treecb447b6e9d3fdc10b3e66a90b198092d7245447a /atomicio.c
parentd6121d2972c1a6924f6d186ea04eefe9dab774ef (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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/atomicio.c b/atomicio.c
index d6797ec7..1299e5bf 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-RCSID("$Id: atomicio.c,v 1.9 2000/03/09 10:27:50 damien Exp $");
+RCSID("$Id: atomicio.c,v 1.10 2000/03/17 12:40:15 damien Exp $");
#include "xmalloc.h"
#include "ssh.h"
@@ -33,12 +33,13 @@ RCSID("$Id: atomicio.c,v 1.9 2000/03/09 10:27:50 damien Exp $");
* ensure all of data on socket comes through. f==read || f==write
*/
ssize_t
-atomicio(f, fd, s, n)
+atomicio(f, fd, _s, n)
ssize_t (*f) ();
int fd;
- void *s;
+ void *_s;
size_t n;
{
+ char *s = _s;
ssize_t res, pos = 0;
while (n > pos) {