From 98041b685e9cbe4916d8684372389e899698da16 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 13 Sep 2017 15:19:14 +0200 Subject: libio: Unify readv() and writev() Update #3132. --- cpukit/libcsupport/include/rtems/libio_.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'cpukit/libcsupport/include/rtems/libio_.h') diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h index 9bf83206e3..adf137d2f6 100644 --- a/cpukit/libcsupport/include/rtems/libio_.h +++ b/cpukit/libcsupport/include/rtems/libio_.h @@ -921,12 +921,19 @@ static inline bool rtems_filesystem_is_parent_directory( return tokenlen == 2 && token [0] == '.' && token [1] == '.'; } -static inline ssize_t rtems_libio_iovec_eval( - int fd, +typedef ssize_t ( *rtems_libio_iovec_adapter )( + rtems_libio_t *iop, const struct iovec *iov, - int iovcnt, - uint32_t flags, - rtems_libio_t **iopp + int iovcnt, + ssize_t total +); + +static inline ssize_t rtems_libio_iovec_eval( + int fd, + const struct iovec *iov, + int iovcnt, + uint32_t flags, + rtems_libio_iovec_adapter adapter ) { ssize_t total; @@ -966,7 +973,10 @@ static inline ssize_t rtems_libio_iovec_eval( } LIBIO_GET_IOP_WITH_ACCESS( fd, iop, flags, EBADF ); - *iopp = iop; + + if ( total > 0 ) { + total = ( *adapter )( iop, iov, iovcnt, total ); + } return total; } -- cgit v1.2.3