[xorg-commit-diffs] xc/lib/FS FSlibInt.c, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/lib/FS
In directory pdx:/tmp/cvs-serv7662/xc/lib/FS

Modified Files:
      Tag: XPRINT
	FSlibInt.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: FSlibInt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/FS/FSlibInt.c,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/FSlibInt.c	4 Mar 2004 17:46:25 -0000	1.1.4.2.6.1
+++ b/FSlibInt.c	10 Apr 2004 09:04:05 -0000	1.1.4.2.6.1.6.1
@@ -498,9 +498,10 @@
 	if (bytes_read > 0) {
 	    size -= bytes_read;
 	    if (iov[0].iov_len < bytes_read) {
-		iov[1].iov_len += iov[0].iov_len - bytes_read;
+		int pad_bytes_read = bytes_read - iov[0].iov_len;
+		iov[1].iov_len -=  pad_bytes_read;
 		iov[1].iov_base =
-		    (char *)iov[1].iov_base +bytes_read - iov[0].iov_len;
+		    (char *)iov[1].iov_base + pad_bytes_read;
 		iov[0].iov_len = 0;
 	    } else {
 		iov[0].iov_len -= bytes_read;