diff options
| author | Jeremy Allison <jra@samba.org> | 2009-05-12 11:45:37 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-05-12 11:45:37 -0700 |
| commit | ad9d64ee1b9e4cd4324b62c2bb2fd2eec9743e30 (patch) | |
| tree | 0e96079ae72d9e24fcfd10cb54ce71fd002fb206 /source3/lib/sendfile.c | |
| parent | 196084d641bf5ede94373c3681835d28b3ac9ee3 (diff) | |
| download | samba-ad9d64ee1b9e4cd4324b62c2bb2fd2eec9743e30.tar.gz samba-ad9d64ee1b9e4cd4324b62c2bb2fd2eec9743e30.tar.bz2 samba-ad9d64ee1b9e4cd4324b62c2bb2fd2eec9743e30.zip | |
Clean up assignments to iov_base, ensure it's always cast to void *. This should quieten some warnings with picky compilers on the buildfarm.
Jeremy.
Diffstat (limited to 'source3/lib/sendfile.c')
| -rw-r--r-- | source3/lib/sendfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c index 59a18ce6e1..3003246dd0 100644 --- a/source3/lib/sendfile.c +++ b/source3/lib/sendfile.c @@ -274,7 +274,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of if (header) { /* Set up the header/trailer iovec. */ - hdtrl[0].iov_base = header->data; + hdtrl[0].iov_base = (void *)header->data; hdtrl[0].iov_len = hdr_len = header->length; } else { hdtrl[0].iov_base = NULL; @@ -320,7 +320,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of hdtrl[0].iov_len = 0; } else { /* iov_base is defined as a void *... */ - hdtrl[0].iov_base = ((char *)hdtrl[0].iov_base) + nwritten; + hdtrl[0].iov_base = (void *)(((char *)hdtrl[0].iov_base) + nwritten); hdtrl[0].iov_len -= nwritten; nwritten = 0; } @@ -351,7 +351,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of /* Set up the header iovec. */ if (header) { - hdtrl.iov_base = header->data; + hdtrl.iov_base = (void *)header->data; hdtrl.iov_len = hdr_len = header->length; } else { hdtrl.iov_base = NULL; @@ -392,7 +392,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of hdtrl.iov_len = 0; } else { hdtrl.iov_base = - (caddr_t)hdtrl.iov_base + nwritten; + (void *)((caddr_t)hdtrl.iov_base + nwritten); hdtrl.iov_len -= nwritten; nwritten = 0; } |