summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:04:05 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:04:05 +0000
commit7046314203cc68b4ece6de066ce86544590cdb5e (patch)
tree31a5f8447a43f158dbc11d2de619b9b1a4ed781f
parent432a8351e02eec25e936cc1da11c610ff837cf5b (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGINXPRINT
-rw-r--r--src/FSlibInt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
index 70167bd..fc17e4f 100644
--- a/src/FSlibInt.c
+++ b/src/FSlibInt.c
@@ -498,9 +498,10 @@ _FSReadPad(svr, data, size)
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;