(submit/fixup-req-len) xfree86: drop swapping request length fields
The request struct's length fields aren't used anymore - we have the client->req_len field instead, which also is bigreq-compatible. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									0d4051e3c7
								
							
						
					
					
						commit
						57c6f5334a
					
				| 
						 | 
					@ -562,8 +562,6 @@ ProcXF86DRIDispatch(register ClientPtr client)
 | 
				
			||||||
static int _X_COLD
 | 
					static int _X_COLD
 | 
				
			||||||
SProcXF86DRIQueryVersion(register ClientPtr client)
 | 
					SProcXF86DRIQueryVersion(register ClientPtr client)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    REQUEST(xXF86DRIQueryVersionReq);
 | 
					 | 
				
			||||||
    swaps(&stuff->length);
 | 
					 | 
				
			||||||
    return ProcXF86DRIQueryVersion(client);
 | 
					    return ProcXF86DRIQueryVersion(client);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -572,7 +570,6 @@ SProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
 | 
					    REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
 | 
				
			||||||
    REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
 | 
					    REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
 | 
				
			||||||
    swaps(&stuff->length);
 | 
					 | 
				
			||||||
    swapl(&stuff->screen);
 | 
					    swapl(&stuff->screen);
 | 
				
			||||||
    return ProcXF86DRIQueryDirectRenderingCapable(client);
 | 
					    return ProcXF86DRIQueryDirectRenderingCapable(client);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -75,7 +75,6 @@ validDrawable(ClientPtr client, XID drawable, Mask access_mode,
 | 
				
			||||||
static int
 | 
					static int
 | 
				
			||||||
ProcDRI2QueryVersion(ClientPtr client)
 | 
					ProcDRI2QueryVersion(ClientPtr client)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    REQUEST(xDRI2QueryVersionReq);
 | 
					 | 
				
			||||||
    xDRI2QueryVersionReply rep = {
 | 
					    xDRI2QueryVersionReply rep = {
 | 
				
			||||||
        .type = X_Reply,
 | 
					        .type = X_Reply,
 | 
				
			||||||
        .sequenceNumber = client->sequence,
 | 
					        .sequenceNumber = client->sequence,
 | 
				
			||||||
| 
						 | 
					@ -84,9 +83,6 @@ ProcDRI2QueryVersion(ClientPtr client)
 | 
				
			||||||
        .minorVersion = dri2_minor
 | 
					        .minorVersion = dri2_minor
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (client->swapped)
 | 
					 | 
				
			||||||
        swaps(&stuff->length);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);
 | 
					    REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (client->swapped) {
 | 
					    if (client->swapped) {
 | 
				
			||||||
| 
						 | 
					@ -651,7 +647,6 @@ SProcDRI2Connect(ClientPtr client)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* If the client is swapped, it's not local.  Talk to the hand. */
 | 
					    /* If the client is swapped, it's not local.  Talk to the hand. */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    swaps(&stuff->length);
 | 
					 | 
				
			||||||
    if (sizeof(*stuff) / 4 != client->req_len)
 | 
					    if (sizeof(*stuff) / 4 != client->req_len)
 | 
				
			||||||
        return BadLength;
 | 
					        return BadLength;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue