test: fix "userdata shadows global declaration" warnings
protocol-xiquerypointer.c:124:72: warning: declaration of ‘userdata’ shadows a global declaration [-Wshadow] and similar Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
parent
e6da635826
commit
47e1d0ea43
|
@ -54,7 +54,7 @@ int __wrap_GrabButton(ClientPtr client, DeviceIntPtr dev,
|
|||
GrabParameters *param, enum InputLevel grabtype,
|
||||
GrabMask *mask);
|
||||
static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len,
|
||||
char *data, void *userdata);
|
||||
char *data, void *closure);
|
||||
|
||||
int
|
||||
__wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
|
||||
|
@ -85,7 +85,7 @@ __wrap_GrabButton(ClientPtr client, DeviceIntPtr dev,
|
|||
}
|
||||
|
||||
static void
|
||||
reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, void *userdata)
|
||||
reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, void *closure)
|
||||
{
|
||||
xXIPassiveGrabDeviceReply *rep = (xXIPassiveGrabDeviceReply *) data;
|
||||
|
||||
|
@ -107,7 +107,7 @@ reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, void *userdata)
|
|||
|
||||
static void
|
||||
reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data,
|
||||
void *userdata)
|
||||
void *closure)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
@ -54,9 +54,9 @@ struct test_data {
|
|||
};
|
||||
|
||||
static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
|
||||
void *userdata);
|
||||
void *closure);
|
||||
static void reply_XIQueryDevice(ClientPtr client, int len, char *data,
|
||||
void *userdata);
|
||||
void *closure);
|
||||
|
||||
/* reply handling for the first bytes that constitute the reply */
|
||||
static void
|
||||
|
@ -86,10 +86,10 @@ reply_XIQueryDevice(ClientPtr client, int len, char *data, void *userdata)
|
|||
|
||||
/* reply handling for the trailing bytes that constitute the device info */
|
||||
static void
|
||||
reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void *userdata)
|
||||
reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void *closure)
|
||||
{
|
||||
int i, j;
|
||||
struct test_data *querydata = (struct test_data *) userdata;
|
||||
struct test_data *querydata = (struct test_data *) closure;
|
||||
|
||||
DeviceIntPtr dev;
|
||||
xXIDeviceInfo *info = (xXIDeviceInfo *) data;
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
static ClientRec client_request;
|
||||
static void reply_XIQueryPointer_data(ClientPtr client, int len,
|
||||
char *data, void *userdata);
|
||||
char *data, void *closure);
|
||||
|
||||
static struct {
|
||||
DeviceIntPtr dev;
|
||||
|
@ -70,7 +70,7 @@ __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
|
|||
}
|
||||
|
||||
static void
|
||||
reply_XIQueryPointer(ClientPtr client, int len, char *data, void *userdata)
|
||||
reply_XIQueryPointer(ClientPtr client, int len, char *data, void *closure)
|
||||
{
|
||||
xXIQueryPointerReply *rep = (xXIQueryPointerReply *) data;
|
||||
SpritePtr sprite;
|
||||
|
@ -121,7 +121,7 @@ reply_XIQueryPointer(ClientPtr client, int len, char *data, void *userdata)
|
|||
}
|
||||
|
||||
static void
|
||||
reply_XIQueryPointer_data(ClientPtr client, int len, char *data, void *userdata)
|
||||
reply_XIQueryPointer_data(ClientPtr client, int len, char *data, void *closure)
|
||||
{
|
||||
reply_handler = reply_XIQueryPointer;
|
||||
}
|
||||
|
|
|
@ -59,10 +59,10 @@ struct test_data {
|
|||
};
|
||||
|
||||
static void
|
||||
reply_XIQueryVersion(ClientPtr client, int len, char *data, void *userdata)
|
||||
reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
|
||||
{
|
||||
xXIQueryVersionReply *rep = (xXIQueryVersionReply *) data;
|
||||
struct test_data *versions = (struct test_data *) userdata;
|
||||
struct test_data *versions = (struct test_data *) closure;
|
||||
unsigned int sver, cver, ver;
|
||||
|
||||
if (client->swapped) {
|
||||
|
@ -85,10 +85,10 @@ reply_XIQueryVersion(ClientPtr client, int len, char *data, void *userdata)
|
|||
}
|
||||
|
||||
static void
|
||||
reply_XIQueryVersion_multiple(ClientPtr client, int len, char *data, void *userdata)
|
||||
reply_XIQueryVersion_multiple(ClientPtr client, int len, char *data, void *closure)
|
||||
{
|
||||
xXIQueryVersionReply *rep = (xXIQueryVersionReply *) data;
|
||||
struct test_data *versions = (struct test_data *) userdata;
|
||||
struct test_data *versions = (struct test_data *) closure;
|
||||
|
||||
reply_check_defaults(rep, len, XIQueryVersion);
|
||||
assert(rep->length == 0);
|
||||
|
|
Loading…
Reference in New Issue
Block a user