[xorg-commit-diffs] xc/lib/FS FSlibInt.c,1.1.4.3,1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/FS
In directory pdx:/home/eich/tstbuild/xc/lib/FS

Modified Files:
      Tag: XORG-CURRENT
	FSlibInt.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: FSlibInt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/FS/FSlibInt.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/FSlibInt.c	5 Mar 2004 13:38:53 -0000	1.1.4.3
+++ b/FSlibInt.c	15 Apr 2004 10:14:52 -0000	1.1.4.4
@@ -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;