Xi: inline SProcXGetDeviceControl()

move the only one relevant line into ProcXGetDeviceControl()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-29 16:21:28 +02:00
committed by Enrico Weigelt
parent 8d82699acf
commit d47357e6c9
3 changed files with 4 additions and 32 deletions

View File

@@ -465,7 +465,7 @@ SProcIDispatch(ClientPtr client)
case X_SetDeviceValuators:
return ProcXSetDeviceValuators(client);
case X_GetDeviceControl:
return SProcXGetDeviceControl(client);
return ProcXGetDeviceControl(client);
case X_ChangeDeviceControl:
return SProcXChangeDeviceControl(client);
/* XI 1.5 */

View File

@@ -44,12 +44,6 @@ SOFTWARE.
********************************************************/
/********************************************************************
*
* Get Device control attributes for an extension device.
*
*/
#include <dix-config.h>
#include <X11/extensions/XI.h>
@@ -62,28 +56,6 @@ SOFTWARE.
#include "exglobals.h"
#include "getdctl.h"
/***********************************************************************
*
* This procedure gets the control attributes for an extension device,
* for clients on machines with a different byte ordering than the server.
*
*/
int _X_COLD
SProcXGetDeviceControl(ClientPtr client)
{
REQUEST(xGetDeviceControlReq);
REQUEST_SIZE_MATCH(xGetDeviceControlReq);
swaps(&stuff->control);
return (ProcXGetDeviceControl(client));
}
/***********************************************************************
*
* This procedure copies DeviceResolution data, swapping if necessary.
*
*/
static void
_writeDeviceResolution(ClientPtr client, ValuatorClassPtr v, x_rpcbuf_t *rpcbuf)
{
@@ -146,6 +118,9 @@ ProcXGetDeviceControl(ClientPtr client)
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (rpcbuf.swapped)
swaps(&stuff->control);
switch (stuff->control) {
case DEVICE_RESOLUTION:
if (!dev->valuator)

View File

@@ -25,9 +25,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETDCTL_H
#define GETDCTL_H 1
int SProcXGetDeviceControl(ClientPtr /* client */
);
int ProcXGetDeviceControl(ClientPtr /* client */
);