diff options
| author | Damien Miller <djm@mindrot.org> | 1999-12-15 09:06:28 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-12-15 09:06:28 +1100 |
| commit | 84093e9d7407b64673d20b38a02bca432f970ba6 (patch) | |
| tree | 82839d5cf06598bbe4ca9365fd0291ce671e6bc9 /atomicio.c | |
| parent | 6ae00d6c965e61fc394b8adb698e9d8c603bbe75 (diff) | |
- Integrated patchs from Juergen Keil <jk@tools.de>
- Avoid void* pointer arithmatic
- Use LDFLAGS correctly
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 46ffee357..fcab2ea7f 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.7 1999/12/07 06:03:33 damien Exp $"); | 27 | RCSID("$Id: atomicio.c,v 1.8 1999/12/14 22:06:28 damien Exp $"); |
| 28 | 28 | ||
| 29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
| 30 | #include "ssh.h" | 30 | #include "ssh.h" |
| @@ -42,7 +42,7 @@ atomicio(f, fd, s, n) | |||
| 42 | int res, pos = 0; | 42 | int res, pos = 0; |
| 43 | 43 | ||
| 44 | while (n > pos) { | 44 | while (n > pos) { |
| 45 | res = (f) (fd, s + pos, n - pos); | 45 | res = (f) (fd, (char*)s + pos, n - pos); |
| 46 | switch (res) { | 46 | switch (res) { |
| 47 | case -1: | 47 | case -1: |
| 48 | if (errno == EINTR || errno == EAGAIN) | 48 | if (errno == EINTR || errno == EAGAIN) |