mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
Xi: use return value of X_SEND_REPLY_SIMPLE()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
90a258d08a
commit
48c72edf38
@@ -230,7 +230,7 @@ ProcXChangeDeviceControl(ClientPtr client)
|
||||
SendEventToAllWindows(dev, DevicePresenceNotifyMask,
|
||||
(xEvent *) &dpn, 1);
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
ret = X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
@@ -105,6 +105,6 @@ ProcXGetDeviceFocus(ClientPtr client)
|
||||
swapl(&rep.focus);
|
||||
swapl(&rep.time);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -106,6 +106,5 @@ ProcXGetExtensionVersion(ClientPtr client)
|
||||
swaps(&rep.minor_version);
|
||||
}
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -135,8 +135,7 @@ ProcXGrabDevice(ClientPtr client)
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
||||
@@ -99,6 +99,5 @@ ProcXSetDeviceButtonMapping(ClientPtr client)
|
||||
.status = (ret == Success ? MappingSuccess : MappingBusy),
|
||||
};
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -109,6 +109,5 @@ ProcXSetDeviceValuators(ClientPtr client)
|
||||
if (rep.status != Success && rep.status != AlreadyGrabbed)
|
||||
return rep.status;
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -99,6 +99,5 @@ ProcXSetDeviceModifierMapping(ClientPtr client)
|
||||
.success = ret,
|
||||
};
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -111,6 +111,5 @@ ProcXSetDeviceMode(ClientPtr client)
|
||||
return rep.status;
|
||||
}
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -82,6 +82,6 @@ ProcXIGetClientPointer(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swaps(&rep.deviceid);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
@@ -127,8 +127,7 @@ ProcXIGrabDevice(ClientPtr client)
|
||||
.status = status
|
||||
};
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return ret;
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
int _X_COLD
|
||||
|
||||
@@ -122,8 +122,8 @@ ProcXIQueryVersion(ClientPtr client)
|
||||
swaps(&rep.major_version);
|
||||
swaps(&rep.minor_version);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
/* Swapping routines */
|
||||
|
||||
@@ -114,6 +114,6 @@ ProcXIGetFocus(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swapl(&rep.focus);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user