@ -14,16 +14,16 @@
// Redistribution and use in source and binary forms, with or without
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// modification, are permitted provided that the following conditions
// are met:
// are met:
//
//
// 1. Redistributions of source code must retain the above copyright
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
// documentation and/or other materials provided with the distribution.
// 3. Neither the name of the project nor the names of its contributors
// 3. Neither the name of the project nor the names of its contributors
// may be used to endorse or promote products derived from this software
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
// without specific prior written permission.
//
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@ -33,9 +33,9 @@
// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
// SUCH DAMAGE.
// SUCH DAMAGE.
//
//
# include <assert.h>
# include <assert.h>
# include <string.h>
# include <string.h>
@ -65,7 +65,7 @@ size_t vrend_read_from_iovec(const struct iovec *iov, int iovlen,
while ( count > 0 & & iovlen > 0 ) {
while ( count > 0 & & iovlen > 0 ) {
if ( iov - > iov_len > offset ) {
if ( iov - > iov_len > offset ) {
len = iov - > iov_len - offset ;
len = iov - > iov_len - offset ;
if ( count < len ) len = count ;
if ( count < len ) len = count ;
memcpy ( buf , ( char * ) iov - > iov_base + offset , len ) ;
memcpy ( buf , ( char * ) iov - > iov_base + offset , len ) ;
@ -123,7 +123,7 @@ size_t vrend_read_from_iovec_cb(const struct iovec *iov, int iovlen,
while ( count > 0 & & iovlen > 0 ) {
while ( count > 0 & & iovlen > 0 ) {
if ( iov - > iov_len > offset ) {
if ( iov - > iov_len > offset ) {
len = iov - > iov_len - offset ;
len = iov - > iov_len - offset ;
if ( count < len ) len = count ;
if ( count < len ) len = count ;
( * iocb ) ( cookie , read , ( char * ) iov - > iov_base + offset , len ) ;
( * iocb ) ( cookie , read , ( char * ) iov - > iov_base + offset , len ) ;