mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
Xi: ProcXChangeDeviceControl() consistenly name reply structs "reply" instead of "rep"
Preparation for future use of generic reply assembly macros. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
b593cd50ee
commit
d1dd9bc5e6
10
Xi/chgdctl.c
10
Xi/chgdctl.c
@@ -104,7 +104,7 @@ ProcXChangeDeviceControl(ClientPtr client)
|
||||
goto out;
|
||||
}
|
||||
|
||||
xChangeDeviceControlReply rep = {
|
||||
xChangeDeviceControlReply reply = {
|
||||
.RepType = X_ChangeDeviceControl,
|
||||
.status = Success,
|
||||
};
|
||||
@@ -123,7 +123,7 @@ ProcXChangeDeviceControl(ClientPtr client)
|
||||
goto out;
|
||||
}
|
||||
if ((dev->deviceGrab.grab) && !SameClient(dev->deviceGrab.grab, client)) {
|
||||
rep.status = AlreadyGrabbed;
|
||||
reply.status = AlreadyGrabbed;
|
||||
ret = Success;
|
||||
goto out;
|
||||
}
|
||||
@@ -145,7 +145,7 @@ ProcXChangeDeviceControl(ClientPtr client)
|
||||
ret = Success;
|
||||
}
|
||||
else if (status == DeviceBusy) {
|
||||
rep.status = DeviceBusy;
|
||||
reply.status = DeviceBusy;
|
||||
ret = Success;
|
||||
}
|
||||
else {
|
||||
@@ -183,7 +183,7 @@ ProcXChangeDeviceControl(ClientPtr client)
|
||||
ret = Success;
|
||||
}
|
||||
else if (status == DeviceBusy) {
|
||||
rep.status = DeviceBusy;
|
||||
reply.status = DeviceBusy;
|
||||
ret = Success;
|
||||
}
|
||||
else {
|
||||
@@ -207,7 +207,7 @@ ProcXChangeDeviceControl(ClientPtr client)
|
||||
SendEventToAllWindows(dev, DevicePresenceNotifyMask,
|
||||
(xEvent *) &dpn, 1);
|
||||
|
||||
ret = X_SEND_REPLY_SIMPLE(client, rep);
|
||||
ret = X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user