diff options
Diffstat (limited to 'xorg-server/test')
| -rw-r--r-- | xorg-server/test/xi2/protocol-eventconvert.c | 110 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xigetclientpointer.c | 12 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xigetselectedevents.c | 17 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xipassivegrabdevice.c | 29 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xiquerydevice.c | 49 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xiquerypointer.c | 24 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xiqueryversion.c | 16 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xiselectevents.c | 11 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xisetclientpointer.c | 7 | ||||
| -rw-r--r-- | xorg-server/test/xi2/protocol-xiwarppointer.c | 19 |
10 files changed, 131 insertions, 163 deletions
diff --git a/xorg-server/test/xi2/protocol-eventconvert.c b/xorg-server/test/xi2/protocol-eventconvert.c index 6e61d74b4..6ec94be6c 100644 --- a/xorg-server/test/xi2/protocol-eventconvert.c +++ b/xorg-server/test/xi2/protocol-eventconvert.c @@ -44,15 +44,13 @@ static void test_values_XIRawEvent(RawDeviceEvent *in, xXIRawEvent *out, if (swap) { - char n; - - swaps(&out->sequenceNumber, n); - swapl(&out->length, n); - swaps(&out->evtype, n); - swaps(&out->deviceid, n); - swapl(&out->time, n); - swapl(&out->detail, n); - swaps(&out->valuators_len, n); + swaps(&out->sequenceNumber); + swapl(&out->length); + swaps(&out->evtype); + swaps(&out->deviceid); + swapl(&out->time); + swapl(&out->detail); + swaps(&out->valuators_len); } @@ -101,9 +99,8 @@ static void test_values_XIRawEvent(RawDeviceEvent *in, xXIRawEvent *out, vo.frac = value->frac; if (swap) { - char n; - swapl(&vo.integral, n); - swapl(&vo.frac, n); + swapl(&vo.integral); + swapl(&vo.frac); } assert(vi.integral == vo.integral); @@ -118,9 +115,8 @@ static void test_values_XIRawEvent(RawDeviceEvent *in, xXIRawEvent *out, vo.frac = raw_value->frac; if (swap) { - char n; - swapl(&vo.integral, n); - swapl(&vo.frac, n); + swapl(&vo.integral); + swapl(&vo.frac); } assert(vi.integral == vo.integral); @@ -276,29 +272,27 @@ static void test_values_XIDeviceEvent(DeviceEvent *in, xXIDeviceEvent *out, FP3232 *values; if (swap) { - char n; - - swaps(&out->sequenceNumber, n); - swapl(&out->length, n); - swaps(&out->evtype, n); - swaps(&out->deviceid, n); - swaps(&out->sourceid, n); - swapl(&out->time, n); - swapl(&out->detail, n); - swapl(&out->root, n); - swapl(&out->event, n); - swapl(&out->child, n); - swapl(&out->root_x, n); - swapl(&out->root_y, n); - swapl(&out->event_x, n); - swapl(&out->event_y, n); - swaps(&out->buttons_len, n); - swaps(&out->valuators_len, n); - swapl(&out->mods.base_mods, n); - swapl(&out->mods.latched_mods, n); - swapl(&out->mods.locked_mods, n); - swapl(&out->mods.effective_mods, n); - swapl(&out->flags, n); + swaps(&out->sequenceNumber); + swapl(&out->length); + swaps(&out->evtype); + swaps(&out->deviceid); + swaps(&out->sourceid); + swapl(&out->time); + swapl(&out->detail); + swapl(&out->root); + swapl(&out->event); + swapl(&out->child); + swapl(&out->root_x); + swapl(&out->root_y); + swapl(&out->event_x); + swapl(&out->event_y); + swaps(&out->buttons_len); + swaps(&out->valuators_len); + swapl(&out->mods.base_mods); + swapl(&out->mods.latched_mods); + swapl(&out->mods.locked_mods); + swapl(&out->mods.effective_mods); + swapl(&out->flags); } assert(out->extension == 0); /* IReqCode defaults to 0 */ @@ -388,9 +382,8 @@ static void test_values_XIDeviceEvent(DeviceEvent *in, xXIDeviceEvent *out, if (swap) { - char n; - swapl(&vo.integral, n); - swapl(&vo.frac, n); + swapl(&vo.integral); + swapl(&vo.frac); } @@ -647,15 +640,13 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in, if (swap) { - char n; - - swaps(&out->sequenceNumber, n); - swapl(&out->length, n); - swaps(&out->evtype, n); - swaps(&out->deviceid, n); - swaps(&out->sourceid, n); - swapl(&out->time, n); - swaps(&out->num_classes, n); + swaps(&out->sequenceNumber); + swapl(&out->length); + swaps(&out->evtype); + swaps(&out->deviceid); + swaps(&out->sourceid); + swapl(&out->time); + swaps(&out->num_classes); } assert(out->type == GenericEvent); @@ -672,10 +663,9 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in, if (swap) { - char n; - swaps(&any->length, n); - swaps(&any->type, n); - swaps(&any->sourceid, n); + swaps(&any->length); + swaps(&any->type); + swaps(&any->sourceid); } switch(any->type) @@ -687,8 +677,7 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in, if (swap) { - char n; - swaps(&b->num_buttons, n); + swaps(&b->num_buttons); } assert(b->length == @@ -703,8 +692,7 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in, { if (swap) { - char n; - swapl(&names[j], n); + swapl(&names[j]); } assert(names[j] == in->buttons.names[j]); } @@ -717,8 +705,7 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in, if (swap) { - char n; - swaps(&k->num_keycodes, n); + swaps(&k->num_keycodes); } assert(k->length == @@ -732,8 +719,7 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in, { if (swap) { - char n; - swapl(&kc[j], n); + swapl(&kc[j]); } assert(kc[j] >= in->keys.min_keycode); assert(kc[j] <= in->keys.max_keycode); diff --git a/xorg-server/test/xi2/protocol-xigetclientpointer.c b/xorg-server/test/xi2/protocol-xigetclientpointer.c index 5e45e7b32..aec58908d 100644 --- a/xorg-server/test/xi2/protocol-xigetclientpointer.c +++ b/xorg-server/test/xi2/protocol-xigetclientpointer.c @@ -70,10 +70,9 @@ static void reply_XIGetClientPointer(ClientPtr client, int len, char *data, void if (client->swapped) { - char n; - swapl(&rep->length, n); - swaps(&rep->sequenceNumber, n); - swaps(&rep->deviceid, n); + swapl(&rep->length); + swaps(&rep->sequenceNumber); + swaps(&rep->deviceid); } reply_check_defaults(rep, len, XIGetClientPointer); @@ -85,7 +84,6 @@ static void reply_XIGetClientPointer(ClientPtr client, int len, char *data, void static void request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq* req, int error) { - char n; int rc; test_data.win = req->win; @@ -97,8 +95,8 @@ static void request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq* assert(client_request.errorValue == req->win); client_request.swapped = TRUE; - swapl(&req->win, n); - swaps(&req->length, n); + swapl(&req->win); + swaps(&req->length); rc = SProcXIGetClientPointer(&client_request); assert(rc == error); diff --git a/xorg-server/test/xi2/protocol-xigetselectedevents.c b/xorg-server/test/xi2/protocol-xigetselectedevents.c index 55de77356..a78fb2655 100644 --- a/xorg-server/test/xi2/protocol-xigetselectedevents.c +++ b/xorg-server/test/xi2/protocol-xigetselectedevents.c @@ -91,10 +91,9 @@ static void reply_XIGetSelectedEvents(ClientPtr client, int len, char *data, voi if (client->swapped) { - char n; - swapl(&rep->length, n); - swaps(&rep->sequenceNumber, n); - swaps(&rep->num_masks, n); + swapl(&rep->length); + swaps(&rep->sequenceNumber); + swaps(&rep->num_masks); } reply_check_defaults(rep, len, XIGetSelectedEvents); @@ -115,9 +114,8 @@ static void reply_XIGetSelectedEvents_data(ClientPtr client, int len, char *data { if (client->swapped) { - char n; - swaps(&mask->deviceid, n); - swaps(&mask->mask_len, n); + swaps(&mask->deviceid); + swaps(&mask->mask_len); } assert(mask->deviceid < 6); @@ -136,7 +134,6 @@ static void reply_XIGetSelectedEvents_data(ClientPtr client, int len, char *data static void request_XIGetSelectedEvents(xXIGetSelectedEventsReq* req, int error) { - char n; int rc; ClientRec client; client = init_client(req->length, req); @@ -148,8 +145,8 @@ static void request_XIGetSelectedEvents(xXIGetSelectedEventsReq* req, int error) reply_handler = reply_XIGetSelectedEvents; client.swapped = TRUE; - swapl(&req->win, n); - swaps(&req->length, n); + swapl(&req->win); + swaps(&req->length); rc = SProcXIGetSelectedEvents(&client); assert(rc == error); } diff --git a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c index a61c1549c..1ffcdee97 100644 --- a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c +++ b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c @@ -85,10 +85,9 @@ static void reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, voi if (client->swapped) { - char n; - swaps(&rep->sequenceNumber, n); - swapl(&rep->length, n); - swaps(&rep->num_modifiers, n); + swaps(&rep->sequenceNumber); + swapl(&rep->length); + swaps(&rep->num_modifiers); testdata.num_modifiers = rep->num_modifiers; } @@ -104,14 +103,13 @@ static void reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, voi static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data, void *userdata) { int i; - int n; xXIGrabModifierInfo *mods = (xXIGrabModifierInfo*)data; for (i = 0; i < testdata.num_modifiers; i++, mods++) { if (client->swapped) - swapl(&mods->modifiers, n); + swapl(&mods->modifiers); /* 1 - 7 is the range we use for the global modifiers array * above */ @@ -128,7 +126,6 @@ static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data static void request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq* req, int error, int errval) { - char n; int rc; int modifiers; @@ -139,20 +136,20 @@ static void request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceRe assert(client_request.errorValue == errval); client_request.swapped = TRUE; - swaps(&req->length, n); - swapl(&req->time, n); - swapl(&req->grab_window, n); - swapl(&req->cursor, n); - swapl(&req->detail, n); - swaps(&req->deviceid, n); + swaps(&req->length); + swapl(&req->time); + swapl(&req->grab_window); + swapl(&req->cursor); + swapl(&req->detail); + swaps(&req->deviceid); modifiers = req->num_modifiers; - swaps(&req->num_modifiers, n); - swaps(&req->mask_len, n); + swaps(&req->num_modifiers); + swaps(&req->mask_len); while(modifiers--) { CARD32 *mod = ((CARD32*)(req + 1)) + modifiers; - swapl(mod, n); + swapl(mod); } rc = SProcXIPassiveGrabDevice(&client_request); diff --git a/xorg-server/test/xi2/protocol-xiquerydevice.c b/xorg-server/test/xi2/protocol-xiquerydevice.c index cb1cc8130..47eb5b14c 100644 --- a/xorg-server/test/xi2/protocol-xiquerydevice.c +++ b/xorg-server/test/xi2/protocol-xiquerydevice.c @@ -64,10 +64,9 @@ static void reply_XIQueryDevice(ClientPtr client, int len, char* data, void *use if (client->swapped) { - char n; - swapl(&rep->length, n); - swaps(&rep->sequenceNumber, n); - swaps(&rep->num_devices, n); + swapl(&rep->length); + swaps(&rep->sequenceNumber); + swaps(&rep->num_devices); } reply_check_defaults(rep, len, XIQueryDevice); @@ -86,7 +85,6 @@ static void reply_XIQueryDevice(ClientPtr client, int len, char* data, void *use /* reply handling for the trailing bytes that constitute the device info */ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void *userdata) { - char n; int i, j; struct test_data *querydata = (struct test_data*)userdata; @@ -98,11 +96,11 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void { if (client->swapped) { - swaps(&info->deviceid, n); - swaps(&info->attachment, n); - swaps(&info->use, n); - swaps(&info->num_classes, n); - swaps(&info->name_len, n); + swaps(&info->deviceid); + swaps(&info->attachment); + swaps(&info->use); + swaps(&info->num_classes); + swaps(&info->name_len); } if (querydata->which_device > XIAllMasterDevices) @@ -152,9 +150,9 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void { if (client->swapped) { - swaps(&any->type, n); - swaps(&any->length, n); - swaps(&any->sourceid, n); + swaps(&any->type); + swaps(&any->length); + swaps(&any->sourceid); } switch(info->deviceid) @@ -168,7 +166,7 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void uint32_t *kc; if (client->swapped) - swaps(&ki->num_keycodes, n); + swaps(&ki->num_keycodes); assert(any->type == XIKeyClass); assert(ki->num_keycodes == (xkb->max_key_code - xkb->min_key_code + 1)); @@ -178,7 +176,7 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void for (k = 0; k < ki->num_keycodes; k++, kc++) { if (client->swapped) - swapl(kc, n); + swapl(kc); assert(*kc >= xkb->min_key_code); assert(*kc <= xkb->max_key_code); @@ -197,7 +195,7 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void xXIButtonInfo *bi = (xXIButtonInfo*)any; if (client->swapped) - swaps(&bi->num_buttons, n); + swaps(&bi->num_buttons); assert(bi->num_buttons == devices.vcp->button->numButtons); @@ -209,13 +207,13 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void if (client->swapped) { - swaps(&vi->number, n); - swapl(&vi->label, n); - swapl(&vi->min.integral, n); - swapl(&vi->min.frac, n); - swapl(&vi->max.integral, n); - swapl(&vi->max.frac, n); - swapl(&vi->resolution, n); + swaps(&vi->number); + swapl(&vi->label); + swapl(&vi->min.integral); + swapl(&vi->min.frac); + swapl(&vi->max.integral); + swapl(&vi->max.frac); + swapl(&vi->resolution); } assert(vi->length == 11); @@ -244,7 +242,6 @@ static void request_XIQueryDevice(struct test_data *querydata, int deviceid, int error) { int rc; - char n; ClientRec client; xXIQueryDeviceReq request; @@ -264,8 +261,8 @@ static void request_XIQueryDevice(struct test_data *querydata, reply_handler = reply_XIQueryDevice; client.swapped = TRUE; - swaps(&request.length, n); - swaps(&request.deviceid, n); + swaps(&request.length); + swaps(&request.deviceid); rc = SProcXIQueryDevice(&client); assert(rc == error); diff --git a/xorg-server/test/xi2/protocol-xiquerypointer.c b/xorg-server/test/xi2/protocol-xiquerypointer.c index 0985ec70d..65346ab5d 100644 --- a/xorg-server/test/xi2/protocol-xiquerypointer.c +++ b/xorg-server/test/xi2/protocol-xiquerypointer.c @@ -81,16 +81,15 @@ static void reply_XIQueryPointer(ClientPtr client, int len, char *data, if (client->swapped) { - char n; - swapl(&rep->length, n); - swaps(&rep->sequenceNumber, n); - swapl(&rep->root, n); - swapl(&rep->child, n); - swapl(&rep->root_x, n); - swapl(&rep->root_y, n); - swapl(&rep->win_x, n); - swapl(&rep->win_y, n); - swaps(&rep->buttons_len, n); + swapl(&rep->length); + swaps(&rep->sequenceNumber); + swapl(&rep->root); + swapl(&rep->child); + swapl(&rep->root_x); + swapl(&rep->root_y); + swapl(&rep->win_x); + swapl(&rep->win_y); + swaps(&rep->buttons_len); } reply_check_defaults(rep, len, XIQueryPointer); @@ -132,7 +131,6 @@ static void reply_XIQueryPointer_data(ClientPtr client, int len, char *data, voi static void request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq* req, int error) { - char n; int rc; rc = ProcXIQueryPointer(&client_request); @@ -142,8 +140,8 @@ static void request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq* req, in assert(client_request.errorValue == req->deviceid); client_request.swapped = TRUE; - swaps(&req->deviceid, n); - swaps(&req->length, n); + swaps(&req->deviceid); + swaps(&req->length); rc = SProcXIQueryPointer(&client_request); assert(rc == error); diff --git a/xorg-server/test/xi2/protocol-xiqueryversion.c b/xorg-server/test/xi2/protocol-xiqueryversion.c index 3bb356e7f..d60d16b9d 100644 --- a/xorg-server/test/xi2/protocol-xiqueryversion.c +++ b/xorg-server/test/xi2/protocol-xiqueryversion.c @@ -64,11 +64,10 @@ static void reply_XIQueryVersion(ClientPtr client, int len, char* data, void *us if (client->swapped) { - char n; - swapl(&rep->length, n); - swaps(&rep->sequenceNumber, n); - swaps(&rep->major_version, n); - swaps(&rep->minor_version, n); + swapl(&rep->length); + swaps(&rep->sequenceNumber); + swaps(&rep->major_version); + swaps(&rep->minor_version); } reply_check_defaults(rep, len, XIQueryVersion); @@ -91,7 +90,6 @@ static void reply_XIQueryVersion(ClientPtr client, int len, char* data, void *us */ static void request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int error) { - char n; int rc; struct test_data versions; xXIQueryVersionReq request; @@ -118,9 +116,9 @@ static void request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int e client.swapped = TRUE; - swaps(&request.length, n); - swaps(&request.major_version, n); - swaps(&request.minor_version, n); + swaps(&request.length); + swaps(&request.major_version); + swaps(&request.minor_version); rc = SProcXIQueryVersion(&client); assert(rc == error); diff --git a/xorg-server/test/xi2/protocol-xiselectevents.c b/xorg-server/test/xi2/protocol-xiselectevents.c index fa422e2cb..4eaf839fa 100644 --- a/xorg-server/test/xi2/protocol-xiselectevents.c +++ b/xorg-server/test/xi2/protocol-xiselectevents.c @@ -89,7 +89,6 @@ int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access static void request_XISelectEvent(xXISelectEventsReq *req, int error) { - char n; int i; int rc; ClientRec client; @@ -114,14 +113,14 @@ static void request_XISelectEvent(xXISelectEventsReq *req, int error) for (i = 0; i < req->num_masks; i++) { next = (xXIEventMask*)((char*)&mask[1] + mask->mask_len * 4); - swaps(&mask->deviceid, n); - swaps(&mask->mask_len, n); + swaps(&mask->deviceid); + swaps(&mask->mask_len); mask = next; } - swapl(&req->win, n); - swaps(&req->length, n); - swaps(&req->num_masks, n); + swapl(&req->win); + swaps(&req->length); + swaps(&req->num_masks); rc = SProcXISelectEvents(&client); assert(rc == error); } diff --git a/xorg-server/test/xi2/protocol-xisetclientpointer.c b/xorg-server/test/xi2/protocol-xisetclientpointer.c index c266b6560..d9620e336 100644 --- a/xorg-server/test/xi2/protocol-xisetclientpointer.c +++ b/xorg-server/test/xi2/protocol-xisetclientpointer.c @@ -66,7 +66,6 @@ int __wrap_dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask a static void request_XISetClientPointer(xXISetClientPointerReq* req, int error) { - char n; int rc; client_request = init_client(req->length, req); @@ -77,9 +76,9 @@ static void request_XISetClientPointer(xXISetClientPointerReq* req, int error) assert(client_request.errorValue == req->deviceid); client_request.swapped = TRUE; - swapl(&req->win, n); - swaps(&req->length, n); - swaps(&req->deviceid, n); + swapl(&req->win); + swaps(&req->length); + swaps(&req->deviceid); rc = SProcXISetClientPointer(&client_request); assert(rc == error); diff --git a/xorg-server/test/xi2/protocol-xiwarppointer.c b/xorg-server/test/xi2/protocol-xiwarppointer.c index 0c8db453d..2b40f63f9 100644 --- a/xorg-server/test/xi2/protocol-xiwarppointer.c +++ b/xorg-server/test/xi2/protocol-xiwarppointer.c @@ -78,7 +78,6 @@ static Bool ScreenSetCursorPosition(DeviceIntPtr dev, ScreenPtr screen, static void request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq* req, int error) { - char n; int rc; rc = ProcXIWarpPointer(client); @@ -93,15 +92,15 @@ static void request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq* req, client->swapped = TRUE; - swapl(&req->src_win, n); - swapl(&req->dst_win, n); - swapl(&req->src_x, n); - swapl(&req->src_y, n); - swapl(&req->dst_x, n); - swapl(&req->dst_y, n); - swaps(&req->src_width, n); - swaps(&req->src_height, n); - swaps(&req->deviceid, n); + swapl(&req->src_win); + swapl(&req->dst_win); + swapl(&req->src_x); + swapl(&req->src_y); + swapl(&req->dst_x); + swapl(&req->dst_y); + swaps(&req->src_width); + swaps(&req->src_height); + swaps(&req->deviceid); rc = SProcXIWarpPointer(client); assert(rc == error); |