andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

record: switch to byte counting functions

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-07-06 14:24:45 +10:00
parent 089c460058
commit 3e1a054423
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
record/record.c
View File

@ -372,7 +372,8 @@ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient,
replylen = pRep->length; replylen = pRep->length;
if (recordingClientSwapped) swapl(&replylen, n); if (recordingClientSwapped) swapl(&replylen, n);
replylen += numElemHeaders + (datalen >> 2) + (futurelen >> 2); replylen += numElemHeaders + bytes_to_int32(datalen) +
bytes_to_int32(futurelen);
if (recordingClientSwapped) swapl(&replylen, n); if (recordingClientSwapped) swapl(&replylen, n);
pRep->length = replylen; pRep->length = replylen;
} /* end if not continued reply */ } /* end if not continued reply */
@ -480,7 +481,7 @@ RecordABigRequest(RecordContextPtr pContext, ClientPtr client, xReq *stuff)
(pointer)stuff, SIZEOF(xReq), bytesLeft); (pointer)stuff, SIZEOF(xReq), bytesLeft);
/* reinsert the extended length field that was squished out */ /* reinsert the extended length field that was squished out */
bigLength = client->req_len + (sizeof(bigLength) >> 2); bigLength = client->req_len + bytes_to_int32(sizeof(bigLength));
if (client->swapped) if (client->swapped)
swapl(&bigLength, n); swapl(&bigLength, n);
RecordAProtocolElement(pContext, client, XRecordFromClient, RecordAProtocolElement(pContext, client, XRecordFromClient,
@ -2279,8 +2280,8 @@ ProcRecordGetContext(ClientPtr client)
{ {
rep.nClients += pRCAP->numClients; rep.nClients += pRCAP->numClients;
rep.length += pRCAP->numClients * rep.length += pRCAP->numClients *
( (sizeof(xRecordClientInfo) >> 2) + ( bytes_to_int32(sizeof(xRecordClientInfo)) +
pri->nRanges * (sizeof(xRecordRange) >> 2)); pri->nRanges * bytes_to_int32(sizeof(xRecordRange)));
} }
/* write the reply header */ /* write the reply header */
@ -2579,13 +2580,13 @@ SwapCreateRegister(xRecordRegisterClientsReq *stuff)
swapl(&stuff->nClients, n); swapl(&stuff->nClients, n);
swapl(&stuff->nRanges, n); swapl(&stuff->nRanges, n);
pClientID = (XID *)&stuff[1]; pClientID = (XID *)&stuff[1];
if (stuff->nClients > stuff->length - (sz_xRecordRegisterClientsReq >> 2)) if (stuff->nClients > stuff->length - bytes_to_int32(sz_xRecordRegisterClientsReq))
return BadLength; return BadLength;
for (i = 0; i < stuff->nClients; i++, pClientID++) for (i = 0; i < stuff->nClients; i++, pClientID++)
{ {
swapl(pClientID, n); swapl(pClientID, n);
} }
if (stuff->nRanges > stuff->length - (sz_xRecordRegisterClientsReq >> 2) if (stuff->nRanges > stuff->length - bytes_to_int32(sz_xRecordRegisterClientsReq)
- stuff->nClients) - stuff->nClients)
return BadLength; return BadLength;
RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges); RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges);