XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: replace CLIENT_ID() macro by dixClientIdForXID() inline function

Browse Source 
Make it type-safe and a bit more obvious what it really does,
also adding some inline documentation. Since it's just some
bit shifting magic, it's qualified for inlining.

The CLIENT_ID() macro isn't used by any external modules, so the
new function doesn't need to be in a public header.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-03-05 12:43:10 +01:00
parent d80866e764
commit 0a315e45dd
23 changed files with 88 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
record/record.c
View File

@@ -37,6 +37,7 @@ and Jim Haggerty of Metheus.
#include "dix/cursor_priv.h"
#include "dix/eventconvert.h"
#include "dix/input_priv.h"
#include "dix/resource_priv.h"
#include "os/client_priv.h"
#include "dixstruct.h"
@@ -865,7 +866,7 @@ RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
if (pRCAP->pRequestMajorOpSet) {
RecordSetIteratePtr pIter = NULL;
RecordSetInterval interval;
ClientPtr pClient = clients[CLIENT_ID(client)];
ClientPtr pClient = clients[dixClientIdForXID(client)];
if (pClient && !RecordClientPrivate(pClient)) {
RecordClientPrivatePtr pClientPriv;
@@ -948,7 +949,7 @@ RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
while (client) {
if (client != XRecordFutureClients) {
if (pRCAP->pRequestMajorOpSet) {
ClientPtr pClient = clients[CLIENT_ID(client)];
ClientPtr pClient = clients[dixClientIdForXID(client)];
int c;
Bool otherRCAPwantsProcVector = FALSE;
RecordClientPrivatePtr pClientPriv = NULL;
@@ -1153,7 +1154,7 @@ RecordSanityCheckClientSpecifiers(ClientPtr client, XID *clientspecs,
continue;
if (errorspec && (CLIENT_BITS(clientspecs[i]) == errorspec))
return BadMatch;
clientIndex = CLIENT_ID(clientspecs[i]);
clientIndex = dixClientIdForXID(clientspecs[i]);
if (clientIndex && clients[clientIndex] &&
clients[clientIndex]->clientState == ClientStateRunning) {
if (clientspecs[i] == clients[clientIndex]->clientAsMask)