diff options
| author | David Leonard <d@cvs.openbsd.org> | 2000-02-01 22:32:54 +0000 |
|---|---|---|
| committer | David Leonard <d@cvs.openbsd.org> | 2000-02-01 22:32:54 +0000 |
| commit | cf3b8f51eff760b82a033b2c82162c037aade510 (patch) | |
| tree | 349d47b91fd4f41beefbd36e467c4be859e1ae04 /usr.bin | |
| parent | 29fc868374b92736d485bb9afaf69c50b0dba453 (diff) | |
int atomicio -> ssize_t (for alpha). ok deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/atomicio.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/atomicio.c b/usr.bin/ssh/atomicio.c index 1a6d116d835..01c1f6285ad 100644 --- a/usr.bin/ssh/atomicio.c +++ b/usr.bin/ssh/atomicio.c @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$Id: atomicio.c,v 1.1 1999/12/06 20:15:25 deraadt Exp $"); +RCSID("$Id: atomicio.c,v 1.2 2000/02/01 22:32:53 d Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -32,14 +32,14 @@ RCSID("$Id: atomicio.c,v 1.1 1999/12/06 20:15:25 deraadt Exp $"); /* * ensure all of data on socket comes through. f==read || f==write */ -int +ssize_t atomicio(f, fd, s, n) - int (*f) (); + ssize_t (*f) (); int fd; void *s; size_t n; { - int res, pos = 0; + ssize_t res, pos = 0; while (n > pos) { res = (f) (fd, s + pos, n - pos); diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h index e35c411c0e3..47872ce8986 100644 --- a/usr.bin/ssh/ssh.h +++ b/usr.bin/ssh/ssh.h @@ -13,7 +13,7 @@ * */ -/* RCSID("$Id: ssh.h,v 1.32 2000/01/04 00:08:00 markus Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.33 2000/02/01 22:32:53 d Exp $"); */ #ifndef SSH_H #define SSH_H @@ -687,7 +687,7 @@ struct envstring { /* * Ensure all of data on socket comes through. f==read || f==write */ -int atomicio(int (*f)(), int fd, void *s, size_t n); +ssize_t atomicio(ssize_t (*f)(), int fd, void *s, size_t n); #ifdef KRB4 #include <krb.h> |