frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: rename dixLookupClient() to dixLookupResourceOwner() 

Choose a bit more precise / descriptive name for that function.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-04-17 14:58:30 +02:00
parent a48b83b9a2
commit 7501ca09b9
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/sync.c
View File

@ -1370,7 +1370,7 @@ ProcSyncSetPriority(ClientPtr client)
if (stuff->id == None) if (stuff->id == None)
priorityclient = client; priorityclient = client;
else { else {
rc = dixLookupClient(&priorityclient, stuff->id, client, rc = dixLookupResourceOwner(&priorityclient, stuff->id, client,
DixSetAttrAccess); DixSetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1406,7 +1406,7 @@ ProcSyncGetPriority(ClientPtr client)
if (stuff->id == None) if (stuff->id == None)
priorityclient = client; priorityclient = client;
else { else {
rc = dixLookupClient(&priorityclient, stuff->id, client, rc = dixLookupResourceOwner(&priorityclient, stuff->id, client,
DixGetAttrAccess); DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;

2
Xext/xselinux_ext.c
View File

@ -298,7 +298,7 @@ ProcSELinuxGetClientContext(ClientPtr client)
REQUEST(SELinuxGetContextReq); REQUEST(SELinuxGetContextReq);
REQUEST_SIZE_MATCH(SELinuxGetContextReq); REQUEST_SIZE_MATCH(SELinuxGetContextReq);
rc = dixLookupClient(&target, stuff->id, client, DixGetAttrAccess); rc = dixLookupResourceOwner(&target, stuff->id, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;

2
Xi/xigetclientpointer.c
View File

@ -67,7 +67,7 @@ ProcXIGetClientPointer(ClientPtr client)
REQUEST_SIZE_MATCH(xXIGetClientPointerReq); REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
if (stuff->win != None) { if (stuff->win != None) {
rc = dixLookupClient(&winclient, stuff->win, client, DixGetAttrAccess); rc = dixLookupResourceOwner(&winclient, stuff->win, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return BadWindow; return BadWindow;

2
Xi/xisetclientpointer.c
View File

@ -82,7 +82,7 @@ ProcXISetClientPointer(ClientPtr client)
pDev = GetMaster(pDev, MASTER_POINTER); pDev = GetMaster(pDev, MASTER_POINTER);
if (stuff->win != None) { if (stuff->win != None) {
rc = dixLookupClient(&targetClient, stuff->win, client, rc = dixLookupResourceOwner(&targetClient, stuff->win, client,
DixManageAccess); DixManageAccess);
if (rc != Success) if (rc != Success)

2
dix/dispatch.c
View File

@ -3349,7 +3349,7 @@ ProcKillClient(ClientPtr client)
return Success; return Success;
} }
rc = dixLookupClient(&killclient, stuff->id, client, DixDestroyAccess); rc = dixLookupResourceOwner(&killclient, stuff->id, client, DixDestroyAccess);
if (rc == Success) { if (rc == Success) {
CloseDownClient(killclient); CloseDownClient(killclient);
if (client == killclient) { if (client == killclient) {

2
dix/dix_priv.h
View File

@ -94,7 +94,7 @@ int dixLookupGC(GCPtr *result,
ClientPtr client, ClientPtr client,
Mask access_mode); Mask access_mode);
int dixLookupClient(ClientPtr *result, int dixLookupResourceOwner(ClientPtr *result,
XID id, XID id,
ClientPtr client, ClientPtr client,
Mask access_mode); Mask access_mode);

2
dix/dixutils.c
View File

@ -218,7 +218,7 @@ dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access)
} }
int int
dixLookupClient(ClientPtr *result, XID id, ClientPtr client, Mask access_mode) dixLookupResourceOwner(ClientPtr *result, XID id, ClientPtr client, Mask access_mode)
{ {
void *pRes; void *pRes;
int rc = BadValue, clientIndex = CLIENT_ID(id); int rc = BadValue, clientIndex = CLIENT_ID(id);

2
miext/rootless/rootlessWindow.c
View File

@ -122,7 +122,7 @@ RootlessNativeWindowMoved(WindowPtr pWin)
/* pretend we're the owner of the window! */ /* pretend we're the owner of the window! */
err = err =
dixLookupClient(&pClient, pWin->drawable.id, serverClient, dixLookupResourceOwner(&pClient, pWin->drawable.id, serverClient,
DixUnknownAccess); DixUnknownAccess);
if (err != Success) { if (err != Success) {
ErrorF("RootlessNativeWindowMoved(): Failed to lookup window: 0x%x\n", ErrorF("RootlessNativeWindowMoved(): Failed to lookup window: 0x%x\n",

2
test/meson.build
View File

@ -218,7 +218,7 @@ if build_xorg
unit_includes += [include_directories('xi1', 'xi2')] unit_includes += [include_directories('xi1', 'xi2')]
ldwraps = [ ldwraps = [
'-Wl,-wrap,dixLookupWindow', '-Wl,-wrap,dixLookupWindow',
'-Wl,-wrap,dixLookupClient', '-Wl,-wrap,dixLookupResourceOwner',
'-Wl,-wrap,WriteToClient', '-Wl,-wrap,WriteToClient',
'-Wl,-wrap,dixLookupWindow', '-Wl,-wrap,dixLookupWindow',
'-Wl,-wrap,XISetEventMask', '-Wl,-wrap,XISetEventMask',

4
test/xi2/protocol-common.c
View File

@ -332,7 +332,7 @@ WRAP_FUNCTION(dixLookupWindow, int,
extern ClientRec client_window; extern ClientRec client_window;
WRAP_FUNCTION(dixLookupClient, int, WRAP_FUNCTION(dixLookupResourceOwner, int,
ClientPtr *pClient, XID rid, ClientPtr client, Mask access) ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
{ {
if (rid == ROOT_WINDOW_ID) if (rid == ROOT_WINDOW_ID)
@ -343,5 +343,5 @@ WRAP_FUNCTION(dixLookupClient, int,
return Success; return Success;
} }
return __real_dixLookupClient(pClient, rid, client, access); return __real_dixLookupResourceOwner(pClient, rid, client, access);
} }