diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-21 14:34:27 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-09-21 14:34:27 -0700 |
| commit | 7fb4bef0394a5d09680985d34bce8252b61493cb (patch) | |
| tree | 9377b410bd93e67d78970c69b7c79cc8c318fa23 /os | |
| parent | 98f4940093dc90c3366d3e4d3ddceacbaee299dc (diff) | |
| parent | c90903b4f7a826ae6826a8dd0a901c8362500e46 (diff) | |
Merge remote-tracking branch 'mattst88/for-keith'
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 6 | ||||
| -rw-r--r-- | os/io.c | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/os/connection.c b/os/connection.c index 0c580ab5e..b339f4e96 100644 --- a/os/connection.c +++ b/os/connection.c @@ -905,9 +905,9 @@ ErrorConnMax(XtransConnInfo trans_conn) if (((*(char *) &whichbyte) && (byteOrder == 'B')) || (!(*(char *) &whichbyte) && (byteOrder == 'l'))) { - swaps(&csp.majorVersion, whichbyte); - swaps(&csp.minorVersion, whichbyte); - swaps(&csp.length, whichbyte); + swaps(&csp.majorVersion); + swaps(&csp.minorVersion); + swaps(&csp.length); } iov[0].iov_len = sz_xConnSetupPrefix; iov[0].iov_base = (char *) &csp; @@ -598,8 +598,7 @@ ResetCurrentRequest(ClientPtr client) ((xBigReq *)oci->bufptr)->length = client->req_len; if (client->swapped) { - char n; - swapl(&((xBigReq *)oci->bufptr)->length, n); + swapl(&((xBigReq *)oci->bufptr)->length); } } if (gotnow >= (needed << 2)) @@ -822,11 +821,10 @@ WriteToClient (ClientPtr who, int count, const void *__buf) { /* start of new reply */ CARD32 replylen; unsigned long bytesleft; - char n; replylen = ((xGenericReply *)buf)->length; if (who->swapped) - swapl(&replylen, n); + swapl(&replylen); bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes; replyinfo.startOfReply = TRUE; replyinfo.bytesRemaining = who->replyBytesRemaining = bytesleft; |