diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 16:37:55 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 16:37:55 +0200 |
commit | 27b0b5723ccbcc92bbcc80dff8fb698b69e74944 (patch) | |
tree | 3b27e6dd17a7d4d00266819545ae97defa11cf81 /nx-X11/programs/Xserver/randr/rrprovider.c | |
parent | d1d859dfdec4b4665e06401383ab71926e4e731c (diff) | |
parent | 286d83260216e8e53db701eed5c785aae1c716bf (diff) | |
download | nx-libs-27b0b5723ccbcc92bbcc80dff8fb698b69e74944.tar.gz nx-libs-27b0b5723ccbcc92bbcc80dff8fb698b69e74944.tar.bz2 nx-libs-27b0b5723ccbcc92bbcc80dff8fb698b69e74944.zip |
Merge branch 'sunweaver-pr/type-safe-swapping' into 3.6.x
Attributes GH PR #167: https://github.com/ArcticaProject/nx-libs/pull/167
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Mon, 04 Jul 2016 07:31:50 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/randr/rrprovider.c')
-rw-r--r-- | nx-X11/programs/Xserver/randr/rrprovider.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c index 7d3096482..9ffb404c5 100644 --- a/nx-X11/programs/Xserver/randr/rrprovider.c +++ b/nx-X11/programs/Xserver/randr/rrprovider.c @@ -43,7 +43,7 @@ RRProviderInitErrorValue(void) if (pScrPriv->provider) { \ providers[count_providers] = pScrPriv->provider->id; \ if (client->swapped) \ - swapl(&providers[count_providers], n); \ + swapl(&providers[count_providers]); \ count_providers++; \ } \ } while(0) @@ -64,7 +64,6 @@ ProcRRGetProviders(ClientPtr client) #ifndef NXAGENT_SERVER ScreenPtr iter; #endif - int n; REQUEST_SIZE_MATCH(xRRGetProvidersReq); #ifndef NXAGENT_SERVER @@ -143,10 +142,10 @@ ProcRRGetProviders(ClientPtr client) } if (client->swapped) { - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swapl(&rep.timestamp, n); - swaps(&rep.nProviders, n); + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.timestamp); + swaps(&rep.nProviders); } WriteToClient(client, sizeof(xRRGetProvidersReply), (char *) &rep); if (extraLen) @@ -179,7 +178,6 @@ ProcRRGetProviderInfo(ClientPtr client) #endif RRProvider *providers; uint32_t *prov_cap; - int n; REQUEST_SIZE_MATCH(xRRGetProviderInfoReq); VERIFY_RR_PROVIDER(stuff->provider, provider, DixReadAccess); @@ -233,31 +231,31 @@ ProcRRGetProviderInfo(ClientPtr client) for (i = 0; i < pScrPriv->numCrtcs; i++) { crtcs[i] = pScrPriv->crtcs[i]->id; if (client->swapped) - swapl(&crtcs[i], n); + swapl(&crtcs[i]); } for (i = 0; i < pScrPriv->numOutputs; i++) { outputs[i] = pScrPriv->outputs[i]->id; if (client->swapped) - swapl(&outputs[i], n); + swapl(&outputs[i]); } i = 0; if (provider->offload_sink) { providers[i] = provider->offload_sink->id; if (client->swapped) - swapl(&providers[i], n); + swapl(&providers[i]); prov_cap[i] = RR_Capability_SinkOffload; if (client->swapped) - swapl(&prov_cap[i], n); + swapl(&prov_cap[i]); i++; } if (provider->output_source) { providers[i] = provider->output_source->id; if (client->swapped) - swapl(&providers[i], n); + swapl(&providers[i]); prov_cap[i] = RR_Capability_SourceOutput; - swapl(&prov_cap[i], n); + swapl(&prov_cap[i]); i++; } #ifndef NXAGENT_SERVER @@ -284,12 +282,12 @@ ProcRRGetProviderInfo(ClientPtr client) #endif memcpy(name, provider->name, rep.nameLength); if (client->swapped) { - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swapl(&rep.capabilities, n); - swaps(&rep.nCrtcs, n); - swaps(&rep.nOutputs, n); - swaps(&rep.nameLength, n); + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.capabilities); + swaps(&rep.nCrtcs); + swaps(&rep.nOutputs); + swaps(&rep.nameLength); } WriteToClient(client, sizeof(xRRGetProviderInfoReply), (char *) &rep); if (extraLen) |