[Libsysio-commit] HEAD: libsysio/src rw.c
Brought to you by:
lward
From: Sonja T. <so...@us...> - 2004-08-13 15:02:59
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11990/src Modified Files: rw.c Log Message: Try 2: take out the MAX_IOVEC references, revert fs_native.c back to its original form (which still has the MAX_IOVEC references, but it defines it and undefines it within one routine...although this still means that someone can define MAX_IOVEC and force the call to _sysio_enumerate_iovec instead of the syscall, but that doesn't place any strict limit on the number of iovecs) Index: rw.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rw.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- rw.c 13 Aug 2004 14:40:09 -0000 1.13 +++ rw.c 13 Aug 2004 15:02:50 -0000 1.14 @@ -689,11 +689,6 @@ PREPEND(_, SYSIO_INTERFACE_NAME(ireadx)) if ((iov_count == 0) || (xtv_count == 0)) SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL); -#ifdef MAX_IOVEC - if ((iov_count >= MAX_IOVEC) || (xtv_count >= MAX_IOVEC)) - SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL); -#endif - err = _sysio_iiox(IIOXOP_READ(fil->f_ino), fil, @@ -734,12 +729,6 @@ SYSIO_INTERFACE_NAME(ireadx)(int fd, if ((iov_count == 0) || (xtv_count == 0)) SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL); -#ifdef MAX_IOVEC - if ((iov_count >= MAX_IOVEC) || (xtv_count >= MAX_IOVEC)) - SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL); -#endif - - ixtv = ixtvent = malloc(xtv_count * sizeof(struct intnl_xtvec)); if (!ixtv) SYSIO_INTERFACE_RETURN(IOID_FAIL, -ENOMEM); |