diff options
| -rw-r--r-- | dix/dispatch.c | 12 | ||||
| -rw-r--r-- | os/connection.c | 10 |
2 files changed, 8 insertions, 14 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index b91b41f4a..44c24337a 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3582,14 +3582,12 @@ ProcInitialConnection(ClientPtr client) REQUEST(xReq); xConnClientPrefix *prefix; int whichbyte = 1; - char order; prefix = (xConnClientPrefix *)((char *)stuff + sz_xReq); - order = prefix->byteOrder; - if (order != 'l' && order != 'B' && order != 'r' && order != 'R') + if ((prefix->byteOrder != 'l') && (prefix->byteOrder != 'B')) return client->noClientException = -1; - if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) || - (!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) + if (((*(char *) &whichbyte) && (prefix->byteOrder == 'B')) || + (!(*(char *) &whichbyte) && (prefix->byteOrder == 'l'))) { client->swapped = TRUE; SwapConnClientPrefix(prefix); @@ -3601,10 +3599,6 @@ ProcInitialConnection(ClientPtr client) { swaps(&stuff->length); } - if (order == 'r' || order == 'R') - { - client->local = FALSE; - } ResetCurrentRequest(client); return Success; } diff --git a/os/connection.c b/os/connection.c index a91501a13..e1b77bb48 100644 --- a/os/connection.c +++ b/os/connection.c @@ -882,7 +882,7 @@ ErrorConnMax(XtransConnInfo trans_conn) xConnSetupPrefix csp; char pad[3]; struct iovec iov[3]; - char order = 0; + char byteOrder = 0; int whichbyte = 1; struct timeval waittime; fd_set mask; @@ -895,16 +895,16 @@ ErrorConnMax(XtransConnInfo trans_conn) FD_SET(fd, &mask); (void)Select(fd + 1, &mask, NULL, NULL, &waittime); /* try to read the byte-order of the connection */ - (void)_XSERVTransRead(trans_conn, &order, 1); - if (order == 'l' || order == 'B' || order == 'r' || order == 'R') + (void)_XSERVTransRead(trans_conn, &byteOrder, 1); + if ((byteOrder == 'l') || (byteOrder == 'B')) { csp.success = xFalse; csp.lengthReason = sizeof(NOROOM) - 1; csp.length = (sizeof(NOROOM) + 2) >> 2; csp.majorVersion = X_PROTOCOL; csp.minorVersion = X_PROTOCOL_REVISION; - if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) || - (!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) + if (((*(char *) &whichbyte) && (byteOrder == 'B')) || + (!(*(char *) &whichbyte) && (byteOrder == 'l'))) { swaps(&csp.majorVersion); swaps(&csp.minorVersion); |