[PR #1515] dix: inline SProcGetProperty()

PR: https://github.com/X11Libre/xserver/pull/1515
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-02 18:41:28 +01:00
parent ae5121043b
commit d7420911d0
4 changed files with 12 additions and 18 deletions

View File

@@ -525,14 +525,22 @@ DeleteAllWindowProperties(WindowPtr pWin)
int
ProcGetProperty(ClientPtr client)
{
REQUEST(xGetPropertyReq);
REQUEST_SIZE_MATCH(xGetPropertyReq);
if (client->swapped) {
swapl(&stuff->window);
swapl(&stuff->property);
swapl(&stuff->type);
swapl(&stuff->longOffset);
swapl(&stuff->longLength);
}
PropertyPtr pProp, prevProp;
unsigned long n, len, ind;
int rc;
Mask win_mode = DixGetPropAccess, prop_mode = DixReadAccess;
REQUEST(xGetPropertyReq);
REQUEST_SIZE_MATCH(xGetPropertyReq);
if (!ValidAtom(stuff->property)) {
client->errorValue = stuff->property;
return BadAtom;

View File

@@ -170,19 +170,6 @@ SProcConfigureWindow(ClientPtr client)
}
int _X_COLD
SProcGetProperty(ClientPtr client)
{
REQUEST(xGetPropertyReq);
REQUEST_SIZE_MATCH(xGetPropertyReq);
swapl(&stuff->window);
swapl(&stuff->property);
swapl(&stuff->type);
swapl(&stuff->longOffset);
swapl(&stuff->longLength);
return ((*ProcVector[X_GetProperty]) (client));
}
int _X_COLD
SProcConvertSelection(ClientPtr client)
{

View File

@@ -55,7 +55,6 @@ int SProcFillPoly(ClientPtr client);
int SProcFreeColors(ClientPtr client);
int SProcGetImage(ClientPtr client);
int SProcGetMotionEvents(ClientPtr client);
int SProcGetProperty(ClientPtr client);
int SProcImageText(ClientPtr client);
int SProcListFonts(ClientPtr client);
int SProcListFontsWithInfo(ClientPtr client);

View File

@@ -352,7 +352,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
ProcGetAtomName,
ProcChangeProperty,
ProcDeleteProperty,
SProcGetProperty, /* 20 */
ProcGetProperty, /* 20 */
ProcListProperties,
ProcSetSelectionOwner,
ProcGetSelectionOwner,