Attachment 119 Details for Bug 267 – Patch to xc/programs/Xserver/Xext/xres.c

[patch] Patch to xc/programs/Xserver/Xext/xres.c

xres.c.patch (text/plain), 2.19 KB, created by Alan Coopersmith on 2004-03-03 18:08:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2004-03-03 18:08:56 UTC

Size: 2.19 KB

patch

obsolete

>--- xres.c.orig	Wed Nov 26 14:48:41 2003
>+++ xres.c	Wed Mar  3 17:55:20 2004
>@@ -52,22 +52,23 @@
>     /* REQUEST(xXResQueryClientsReq); */
>     xXResQueryClientsReply rep;
>     int *current_clients;
>-    int i;
>+    int i, num_clients;
> 
>     REQUEST_SIZE_MATCH(xXResQueryClientsReq);
> 
>     current_clients = ALLOCATE_LOCAL((currentMaxClients - 1) * sizeof(int));
> 
>-    rep.num_clients = 0;
>+    num_clients = 0;
>     for(i = 1; i < currentMaxClients; i++) {
>        if(clients[i]) {
>-           current_clients[rep.num_clients] = i;
>-           rep.num_clients++;   
>+           current_clients[num_clients] = i;
>+           num_clients++;   
>        }
>     }
> 
>     rep.type = X_Reply;
>     rep.sequenceNumber = client->sequence;
>+    rep.num_clients = num_clients;
>     rep.length = rep.num_clients * sz_xXResClient >> 2;
>     if (client->swapped) {
>         int n;
>@@ -77,10 +78,10 @@
>     }   
>     WriteToClient (client, sizeof (xXResQueryClientsReply), (char *) &rep);
> 
>-    if(rep.num_clients) {
>+    if(num_clients) {
>         xXResClient scratch;
> 
>-        for(i = 0; i < rep.num_clients; i++) {
>+        for(i = 0; i < num_clients; i++) {
>             scratch.resource_base = clients[current_clients[i]]->clientAsMask;
>             scratch.resource_mask = RESOURCE_ID_MASK;
>         
>@@ -112,7 +113,7 @@
> {
>     REQUEST(xXResQueryClientResourcesReq);
>     xXResQueryClientResourcesReply rep;
>-    int i, clientID;
>+    int i, clientID, num_types;
>     int *counts;
> 
>     REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq);
>@@ -132,14 +133,15 @@
> 
>     FindAllClientResources(clients[clientID], ResFindAllRes, counts);
> 
>-    rep.num_types = 0;
>+    num_types = 0;
> 
>     for(i = 0; i <= lastResourceType; i++) {
>-       if(counts[i]) rep.num_types++;
>+       if(counts[i]) num_types++;
>     }
> 
>     rep.type = X_Reply;
>     rep.sequenceNumber = client->sequence;
>+    rep.num_types = num_types;
>     rep.length = rep.num_types * sz_xXResType >> 2;
>     if (client->swapped) {
>         int n;
>@@ -149,7 +151,7 @@
>     }   
>     WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep);
> 
>-    if(rep.num_types) {
>+    if(num_types) {
>         xXResType scratch;
> 
>         for(i = 0; i < lastResourceType; i++) {

Actions: View | Splinter Review

Attachments on bug 267: 119

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.