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/modules | |
| 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/modules')
| -rw-r--r-- | source3/modules/onefs_system.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_aio_fork.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c index cf99a27a87..22ef2f481b 100644 --- a/source3/modules/onefs_system.c +++ b/source3/modules/onefs_system.c @@ -231,7 +231,7 @@ static ssize_t onefs_sys_do_sendfile(int tofd, int fromfd, /* 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; @@ -293,7 +293,7 @@ static ssize_t onefs_sys_do_sendfile(int tofd, int fromfd, 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; } diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index e29ce5e7a8..8568ec3916 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -135,7 +135,7 @@ static ssize_t read_fd(int fd, void *ptr, size_t nbytes, int *recvfd) msg.msg_name = NULL; msg.msg_namelen = 0; - iov[0].iov_base = ptr; + iov[0].iov_base = (void *)ptr; iov[0].iov_len = nbytes; msg.msg_iov = iov; msg.msg_iovlen = 1; @@ -206,7 +206,7 @@ static ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd) msg.msg_namelen = 0; ZERO_STRUCT(iov); - iov[0].iov_base = ptr; + iov[0].iov_base = (void *)ptr; iov[0].iov_len = nbytes; msg.msg_iov = iov; msg.msg_iovlen = 1; |