diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-30 11:52:26 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-15 13:14:07 +1000 |
| commit | a20f6b0a34607c48f94b105a1939aca38283cee8 (patch) | |
| tree | 3d917510d9d7ce7c4f9761584a87586ff13d77ca | |
| parent | 00155fba2c650c86900a7a7ce68fefff10dce3de (diff) | |
Remove superfluous (void) casts.
sed -e "s/\([ ]\)(void) \(.*\)/\1\2/"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
259 files changed, 1581 insertions, 1581 deletions
diff --git a/xts5/XI/AllowDeviceEvents.m b/xts5/XI/AllowDeviceEvents.m index 47114013..aa489ff3 100644 --- a/xts5/XI/AllowDeviceEvents.m +++ b/xts5/XI/AllowDeviceEvents.m @@ -136,7 +136,7 @@ grabstartup() DeviceButtonPress(device, dbp, class[1]); DeviceButtonRelease(device, dbr, class[2]); XSelectExtensionEvent(Dsp, grabwin, class, 3); - (void) warppointer(Dsp, grabwin, 1, 1); + warppointer(Dsp, grabwin, 1, 1); XSync(Dsp,0); return (1); } @@ -541,7 +541,7 @@ struct area area; /* * Set up a device freeze as a result of a button press. */ - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); setarea(&area, 50, 50, 5, 5); chwin = crechild(display, grabwin, &area); @@ -557,7 +557,7 @@ struct area area; * Activate the grab. */ XSync(display, True); /* Discard any events */ - (void) warppointer(display, chwin, 1, 1); + warppointer(display, chwin, 1, 1); devicebuttonpress(display, Devs.Button, Button1); XSync(display,False); @@ -643,7 +643,7 @@ Verify device is not frozen. return; device = Devs.Button; event_mode = ReplayThisDevice; - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); XCALL; if (!ispfrozen(display)) @@ -678,7 +678,7 @@ int key; if (noext(1)) return; - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); XSync(display,0); key = getkeycode(display); @@ -777,7 +777,7 @@ int key; */ win = defwin(display); XSelectInput(display, win, KeyPressMask); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 1, 1); keypress(display, key); if (XCheckMaskEvent(display, (long)KeyPressMask, &ev)) res = False; @@ -797,7 +797,7 @@ bothset() XUngrabDevice(display, device, CurrentTime); XUngrabKeyboard(display, CurrentTime); - (void) warppointer(display, grabwin, 5, 5); + warppointer(display, grabwin, 5, 5); XGrabDevice(display, device, grabwin, False, 3, class, GrabModeSync, GrabModeAsync, CurrentTime); @@ -976,7 +976,7 @@ int key; False, PointerMotionMask, GrabModeSync, GrabModeSync, None, None); - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); devicebuttonpress(display, Devs.Button, Button1); if (ispfrozen(display)) diff --git a/xts5/XI/CloseDevice.m b/xts5/XI/CloseDevice.m index c7ea657c..1ab0273c 100644 --- a/xts5/XI/CloseDevice.m +++ b/xts5/XI/CloseDevice.m @@ -276,7 +276,7 @@ int Min_KeyCode, Max_KeyCode, numkeys; w = defwin(display); w2 = defwin(client1); - (void) warppointer(client1, w2, 1, 1); + warppointer(client1, w2, 1, 1); DeviceKeyPress(dev2, dkp, dkpclass); DeviceKeyRelease(dev2, dkr, dkrclass); XSelectExtensionEvent(client1, w2, &dkpclass, 1); @@ -359,7 +359,7 @@ int Min_KeyCode, Max_KeyCode, numkeys; dev2 = XOpenDevice(client1,Devs.Key->device_id); w = defwin(client1); - (void) warppointer(client1, w, 1, 1); + warppointer(client1, w, 1, 1); DeviceKeyPress(dev2, dkp, dkpclass); DeviceKeyRelease(dev2, dkr, dkrclass); XSelectExtensionEvent(client1, w, &dkpclass, 1); diff --git a/xts5/XI/GrabDevice.m b/xts5/XI/GrabDevice.m index bac7d0c7..7eae5d76 100644 --- a/xts5/XI/GrabDevice.m +++ b/xts5/XI/GrabDevice.m @@ -309,7 +309,7 @@ XEvent ev; device = Devs.NoKeys; grab_window = defwin(display); - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); DeviceKeyRelease(Devs.Key, dkr, dkrclass); XSelectExtensionEvent(display, grab_window, &dkrclass, 1); other_devices_mode = GrabModeAsync; @@ -367,7 +367,7 @@ XEvent ev; device = Devs.NoKeys; grab_window = defwin(display); - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); DeviceKeyRelease(Devs.Key, dkr, dkrclass); XSelectExtensionEvent(display, grab_window, &dkrclass, 1); other_devices_mode = GrabModeSync; @@ -465,7 +465,7 @@ XEventClass dmnc; return; } DeviceMotionNotify(Devs.Valuator, dmn, dmnc); - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); client2 = opendisplay(); @@ -488,7 +488,7 @@ XEventClass dmnc; * If the grab has been released then this will generate * an event for client2. */ - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (XCheckWindowEvent(client2, win, PointerMotionMask|EnterWindowMask, &ev)) diff --git a/xts5/XI/GrabDeviceButton.m b/xts5/XI/GrabDeviceButton.m index 6fcc0534..e95a77b9 100644 --- a/xts5/XI/GrabDeviceButton.m +++ b/xts5/XI/GrabDeviceButton.m @@ -367,7 +367,7 @@ int n; XSelectExtensionEvent(display, grab_window, &dbrclass, 1); - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); XSync(display, True); /* Discard any events */ devicebuttonpress(display, Devs.Button, Button1); diff --git a/xts5/XI/GrabDeviceKey.m b/xts5/XI/GrabDeviceKey.m index c451e4f4..2dd5bcf1 100644 --- a/xts5/XI/GrabDeviceKey.m +++ b/xts5/XI/GrabDeviceKey.m @@ -271,7 +271,7 @@ int ret, n; DeviceKeyRelease(device, dkr, dkrclass); XSelectExtensionEvent(display, grab_window, &dkpclass, 1); - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); XSync(display, True); /* Discard any events */ devicekeypress(display, device, MinKeyCode); XSync(display, False); diff --git a/xts5/XI/SendExtensionEvent.m b/xts5/XI/SendExtensionEvent.m index 5311bebd..01f448dc 100644 --- a/xts5/XI/SendExtensionEvent.m +++ b/xts5/XI/SendExtensionEvent.m @@ -248,15 +248,15 @@ XEventClass dbpc; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Save initial pointer location. */ - (void) XQueryPointer(display, ptrwin, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, ptrwin, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to window. */ XWarpPointer(display, None, ptrwin, 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, ptrwin, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -272,7 +272,7 @@ XEventClass dbpc; /* Get current pointer location. */ if (XQueryPointer(display, ptrwin, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -291,7 +291,7 @@ XEventClass dbpc; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendExtensionEvent returned non-zero. */ @@ -406,18 +406,18 @@ XEventClass dbpc; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to parent window. */ XSetDeviceFocus(display, device, parent, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to inferior of focus window. */ XWarpPointer(display, None, child, 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -434,7 +434,7 @@ XEventClass dbpc; /* Get current pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -453,7 +453,7 @@ XEventClass dbpc; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendExtensionEvent returned non-zero. */ @@ -998,18 +998,18 @@ XEventClass noextensioneventclass, dbpc; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to parent window. */ XSetDeviceFocus(display, Devs.Button, parent, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to inferior of focus window. */ XWarpPointer(display, None, child, 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -1027,7 +1027,7 @@ XEventClass noextensioneventclass, dbpc; /* Get current pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -1046,7 +1046,7 @@ XEventClass noextensioneventclass, dbpc; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendExtensionEvent returned non-zero. */ @@ -1154,18 +1154,18 @@ XEventClass noextensioneventclass, dbpc; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to new focus window. */ XSetInputFocus(display, nfocus, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer away from inferior of focus window; to root. */ XWarpPointer(display, None, DRW(display), 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -1185,7 +1185,7 @@ XEventClass noextensioneventclass, dbpc; /* Get current pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -1204,7 +1204,7 @@ XEventClass noextensioneventclass, dbpc; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendExtensionEvent returned non-zero. */ @@ -1229,18 +1229,18 @@ XEventClass noextensioneventclass, dbpc; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to new focus window. */ XSetInputFocus(display, nfocus, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer away from inferior of focus window; to root. */ XWarpPointer(display, None, DRW(display), 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -1251,7 +1251,7 @@ XEventClass noextensioneventclass, dbpc; /* Get current pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -1270,7 +1270,7 @@ XEventClass noextensioneventclass, dbpc; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendExtensionEvent returned non-zero. */ diff --git a/xts5/XI/SetDeviceButtonMapping.m b/xts5/XI/SetDeviceButtonMapping.m index adc5cacd..54b03ad7 100644 --- a/xts5/XI/SetDeviceButtonMapping.m +++ b/xts5/XI/SetDeviceButtonMapping.m @@ -158,7 +158,7 @@ restoremap() device = Devs.Button; if(Dsp && Devs.Button) { - (void) XSetDeviceButtonMapping(Dsp, device, oldmap, nbtns); + XSetDeviceButtonMapping(Dsp, device, oldmap, nbtns); XSync(Dsp,0); } cleanup(); @@ -200,7 +200,7 @@ int i; XCALL; - (void) XGetDeviceButtonMapping(display, device, newmap, MAPSIZE); + XGetDeviceButtonMapping(display, device, newmap, MAPSIZE); if (isdeleted()) { delete("Could not get device button mapping"); return; @@ -304,7 +304,7 @@ int dbp; win = defwin(display); device = Devs.Button; DeviceButtonPress(device, dbp, dbpclass); - (void) warppointer(display, win, 2,2); + warppointer(display, win, 2,2); XSelectExtensionEvent(display, win, &dbpclass, 1); for(i=0; i<nbtns; i++) { diff --git a/xts5/XI/XGetDeviceModifierMapping.m b/xts5/XI/XGetDeviceModifierMapping.m index e7b42b79..c4c29049 100644 --- a/xts5/XI/XGetDeviceModifierMapping.m +++ b/xts5/XI/XGetDeviceModifierMapping.m @@ -255,7 +255,7 @@ int non_zero = 0; return; } else CHECK; - (void) warppointer(display, win, 2,2); /* dgrabbed restores pointer */ + warppointer(display, win, 2,2); /* dgrabbed restores pointer */ for(k=minkc; k <= maxkc; k++) { devicekeypress(display, Devs.Mod, k); devicebuttonpress(display, Devs.Button, Button1); diff --git a/xts5/XI/XSetDeviceFocus.m b/xts5/XI/XSetDeviceFocus.m index 5ecd6550..181c61c8 100644 --- a/xts5/XI/XSetDeviceFocus.m +++ b/xts5/XI/XSetDeviceFocus.m @@ -166,7 +166,7 @@ XEventClass classes[2]; XSelectExtensionEvent(display, win, classes, 2); focus = None; XCALL; - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 2, 2); XSync(display, True); /* clear out event queue */ devicekeypress(display, device, MinKeyCode); if (n=getevent(display, &ev)) /* assignment intentional */ { @@ -346,7 +346,7 @@ XEventClass classes[2], nevclass; trace("Test with toplevel window and PointerRoot."); focus = PointerRoot; XCALL; - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 2, 2); XSync(display, True); /* clear out event queue */ devicekeypress(display, device, MinKeyCode); if (!getevent(display, &ev)) { @@ -362,7 +362,7 @@ XEventClass classes[2], nevclass; } else CHECK; trace("Test with root and PointerRoot."); - (void) warppointer(display, root, 0,0); + warppointer(display, root, 0,0); XSync(display, True); /* clear out event queue */ devicekeyrel(display, device, MinKeyCode); if (!getevent(display, &ev)) { @@ -383,7 +383,7 @@ XEventClass classes[2], nevclass; trace("Testing with root of alternate screen as source (0x%x) and PointerRoot.", (unsigned)altroot); XSelectExtensionEvent(display, altroot, classes, 2); - (void) warppointer(display, altroot, 0,0); + warppointer(display, altroot, 0,0); XSync(display, True); /* clear out event queue */ devicekeypress(display, device, MinKeyCode); devicekeyrel(display, device, MinKeyCode); @@ -622,7 +622,7 @@ XEventClass classes[2], nevclass; focus = crechild(display, base, (struct area *)0); revert_to = RevertToPointerRoot; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); if (isdeleted()) return; @@ -781,7 +781,7 @@ XEventClass classes[2]; focus = crechild(display, base, (struct area *)0); revert_to = RevertToFollowKeyboard; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); if (isdeleted()) return; @@ -934,7 +934,7 @@ XEventClass classes[2]; focus = crechild(display, base, (struct area *)0); revert_to = RevertToNone; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); if (isdeleted()) return; diff --git a/xts5/XI/XUngrabDevice.m b/xts5/XI/XUngrabDevice.m index d8f3bf7d..864adea7 100644 --- a/xts5/XI/XUngrabDevice.m +++ b/xts5/XI/XUngrabDevice.m @@ -148,7 +148,7 @@ int dkp, dkr; } else CHECK; - (void) warppointer(display, win, 10, 10); + warppointer(display, win, 10, 10); XSync(display,1); devicekeypress(display, Devs.Key, MinKeyCode); devicekeyrel(display, Devs.Key, MinKeyCode); @@ -170,7 +170,7 @@ int dkp, dkr; FAIL; } else { first = ev.type; - (void) getevent(display, &ev); + getevent(display, &ev); if (ev.type != dkp && first != dkp) { report("Did not get DeviceKeyPress event after releasing grab"); @@ -186,7 +186,7 @@ int dkp, dkr; win = defwin(display); XSelectExtensionEvent(display, win, &dkclass[0], 1); - (void) warppointer(display, win, 5, 5); + warppointer(display, win, 5, 5); devicekeypress(display, Devs.Key, MinKeyCode); if (XPending(display)) { XNextEvent(display, &ev); @@ -230,8 +230,8 @@ XEvent ev; win = defwin(display); XSelectInput(display, win, PointerMotionMask); - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 0, 0); + warppointer(display, win, 1, 1); if (XCheckWindowEvent(display, win, PointerMotionMask, &ev)) return(False); diff --git a/xts5/XIproto/AllowDeviceEvents.m b/xts5/XIproto/AllowDeviceEvents.m index 12740659..1065f9c7 100644 --- a/xts5/XIproto/AllowDeviceEvents.m +++ b/xts5/XIproto/AllowDeviceEvents.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(AnyMask)) { Log_Err("Required extension devices are not present\n"); @@ -145,18 +145,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default AllowDeviceEvents request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent AllowDeviceEvents request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong AllowDeviceEvents request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ChangeDeviceControl.m b/xts5/XIproto/ChangeDeviceControl.m index 856082a7..3c2c4cd7 100644 --- a/xts5/XIproto/ChangeDeviceControl.m +++ b/xts5/XIproto/ChangeDeviceControl.m @@ -129,7 +129,7 @@ void tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(DCtlMask)) { Log_Err("Required extension devices are not present\n"); @@ -153,18 +153,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeDeviceControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeDeviceControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ChangeDeviceDontPropagateList.m b/xts5/XIproto/ChangeDeviceDontPropagateList.m index 771b4e3b..a157a1b5 100644 --- a/xts5/XIproto/ChangeDeviceDontPropagateList.m +++ b/xts5/XIproto/ChangeDeviceDontPropagateList.m @@ -127,7 +127,7 @@ void tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(ValMask)) { Log_Err("Required extension devices are not present\n"); @@ -143,18 +143,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeDeviceDontPropagateList request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeDeviceDontPropagateList request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeDeviceDontPropagateList request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ChangeDeviceKeyMapping.m b/xts5/XIproto/ChangeDeviceKeyMapping.m index 898112f6..1daa34ab 100644 --- a/xts5/XIproto/ChangeDeviceKeyMapping.m +++ b/xts5/XIproto/ChangeDeviceKeyMapping.m @@ -162,7 +162,7 @@ XEventClass dmncl; Log_Trace("client %d received GetDeviceKeyMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); /* ... then make a request to duplicate that mapping. */ @@ -199,18 +199,18 @@ XEventClass dmncl; /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeDeviceKeyMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeDeviceKeyMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ChangeFeedbackControl.m b/xts5/XIproto/ChangeFeedbackControl.m index 8ef8ae26..1a080163 100644 --- a/xts5/XIproto/ChangeFeedbackControl.m +++ b/xts5/XIproto/ChangeFeedbackControl.m @@ -136,18 +136,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeFeedbackControl request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeFeedbackControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeFeedbackControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ChangeKeyboardDevice.m b/xts5/XIproto/ChangeKeyboardDevice.m index b317843d..7bdba8c6 100644 --- a/xts5/XIproto/ChangeKeyboardDevice.m +++ b/xts5/XIproto/ChangeKeyboardDevice.m @@ -218,18 +218,18 @@ XEventClass chdvnotcl; /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeKeyboardDevice request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeKeyboardDevice request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ChangePointerDevice.m b/xts5/XIproto/ChangePointerDevice.m index 0643837e..ac9e6b55 100644 --- a/xts5/XIproto/ChangePointerDevice.m +++ b/xts5/XIproto/ChangePointerDevice.m @@ -217,18 +217,18 @@ extern int SavPID; /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangePointerDevice request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangePointerDevice request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/CloseDevice.m b/xts5/XIproto/CloseDevice.m index 91795e57..b2626cc6 100644 --- a/xts5/XIproto/CloseDevice.m +++ b/xts5/XIproto/CloseDevice.m @@ -142,18 +142,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CloseDevice request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CloseDevice request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CloseDevice request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/DeviceBell.m b/xts5/XIproto/DeviceBell.m index fd6bec0a..64603f69 100644 --- a/xts5/XIproto/DeviceBell.m +++ b/xts5/XIproto/DeviceBell.m @@ -142,18 +142,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default DeviceBell request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent DeviceBell request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong DeviceBell request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceButtonMapping.m b/xts5/XIproto/GetDeviceButtonMapping.m index 8acd362c..03b9f652 100644 --- a/xts5/XIproto/GetDeviceButtonMapping.m +++ b/xts5/XIproto/GetDeviceButtonMapping.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceButtonMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceButtonMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceControl.m b/xts5/XIproto/GetDeviceControl.m index 44f1072e..f0edc020 100644 --- a/xts5/XIproto/GetDeviceControl.m +++ b/xts5/XIproto/GetDeviceControl.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceDontPropagateList.m b/xts5/XIproto/GetDeviceDontPropagateList.m index ca0ff5ca..d412e452 100644 --- a/xts5/XIproto/GetDeviceDontPropagateList.m +++ b/xts5/XIproto/GetDeviceDontPropagateList.m @@ -133,7 +133,7 @@ Display *client1, *opendisplay(); Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); /* Create client1. */ if (!Setup_Extension_DeviceInfo(KeyMask)) @@ -169,18 +169,18 @@ Display *client1, *opendisplay(); /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceDontPropagateList request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceDontPropagateList request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceFocus.m b/xts5/XIproto/GetDeviceFocus.m index f5f271be..8ad3bd03 100644 --- a/xts5/XIproto/GetDeviceFocus.m +++ b/xts5/XIproto/GetDeviceFocus.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceFocus request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceFocus request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceKeyMapping.m b/xts5/XIproto/GetDeviceKeyMapping.m index e99d676c..dfeb45b8 100644 --- a/xts5/XIproto/GetDeviceKeyMapping.m +++ b/xts5/XIproto/GetDeviceKeyMapping.m @@ -151,18 +151,18 @@ tester() Log_Trace("client %d received GetDeviceKeyMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceKeyMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceKeyMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceModifierMapping.m b/xts5/XIproto/GetDeviceModifierMapping.m index b1878959..180dff54 100644 --- a/xts5/XIproto/GetDeviceModifierMapping.m +++ b/xts5/XIproto/GetDeviceModifierMapping.m @@ -154,18 +154,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceModifierMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceModifierMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetDeviceMotionEvents.m b/xts5/XIproto/GetDeviceMotionEvents.m index 647280a5..14b1172d 100644 --- a/xts5/XIproto/GetDeviceMotionEvents.m +++ b/xts5/XIproto/GetDeviceMotionEvents.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetDeviceMotionEvents request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetDeviceMotionEvents request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetExtensionVersion.m b/xts5/XIproto/GetExtensionVersion.m index 3ffbd3ed..6ee584b4 100644 --- a/xts5/XIproto/GetExtensionVersion.m +++ b/xts5/XIproto/GetExtensionVersion.m @@ -154,18 +154,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetExtensionVersion request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetExtensionVersion request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetFeedbackControl.m b/xts5/XIproto/GetFeedbackControl.m index 9e0d5626..11f60204 100644 --- a/xts5/XIproto/GetFeedbackControl.m +++ b/xts5/XIproto/GetFeedbackControl.m @@ -146,18 +146,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetFeedbackControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetFeedbackControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GetSelectedExtensionEvents.m b/xts5/XIproto/GetSelectedExtensionEvents.m index 574ee7e4..62737ba9 100644 --- a/xts5/XIproto/GetSelectedExtensionEvents.m +++ b/xts5/XIproto/GetSelectedExtensionEvents.m @@ -132,7 +132,7 @@ Display *client1, *opendisplay(); Window w; Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(KeyMask)) { Log_Err("Required extension devices are not present\n"); @@ -166,18 +166,18 @@ Window w; /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetSelectedExtensionEvents request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetSelectedExtensionEvents request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GrabDevice.m b/xts5/XIproto/GrabDevice.m index 2bf04e49..32d373a9 100644 --- a/xts5/XIproto/GrabDevice.m +++ b/xts5/XIproto/GrabDevice.m @@ -131,7 +131,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(KeyMask)) { Log_Err("Required extension devices are not present\n"); @@ -155,18 +155,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabDevice request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabDevice request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GrabDeviceButton.m b/xts5/XIproto/GrabDeviceButton.m index 87d9e7bd..b4f501ab 100644 --- a/xts5/XIproto/GrabDeviceButton.m +++ b/xts5/XIproto/GrabDeviceButton.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(BtnMask)) { Log_Err("Required extension devices are not present\n"); @@ -145,18 +145,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default GrabDeviceButton request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabDeviceButton request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabDeviceButton request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/GrabDeviceKey.m b/xts5/XIproto/GrabDeviceKey.m index 3b948289..bf1fefe5 100644 --- a/xts5/XIproto/GrabDeviceKey.m +++ b/xts5/XIproto/GrabDeviceKey.m @@ -135,7 +135,7 @@ tester() return; } - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xGrabDeviceKeyReq *) Make_XInput_Req(CLIENT, X_GrabDeviceKey); @@ -145,18 +145,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default GrabDeviceKey request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabDeviceKey request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabDeviceKey request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/ListInputDevices.m b/xts5/XIproto/ListInputDevices.m index 413d16b7..f6c3808a 100644 --- a/xts5/XIproto/ListInputDevices.m +++ b/xts5/XIproto/ListInputDevices.m @@ -154,18 +154,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListInputDevices request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListInputDevices request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/Miscellaneous.m b/xts5/XIproto/Miscellaneous.m index 2da60e3d..e3bf53f0 100644 --- a/xts5/XIproto/Miscellaneous.m +++ b/xts5/XIproto/Miscellaneous.m @@ -134,7 +134,7 @@ xSelectExtensionEventReq *req; XDevice *dev; Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); dpy2 = opendisplay(); if (dpy2 == (Display *) NULL) { @@ -153,7 +153,7 @@ XDevice *dev; switch(test_type) { case GOOD: Log_Trace("client %d sent default SelectExtensionEvent request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); if (Devs.Key){ dev = Devs.Key; devicekeypress (dpy2, dev, MinKeyCode); @@ -176,14 +176,14 @@ XDevice *dev; break; case BAD_LENGTH: Log_Trace("client %d sent SelectExtensionEvent request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SelectExtensionEvent request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/OpenDevice.m b/xts5/XIproto/OpenDevice.m index 0362697a..8f6b9752 100644 --- a/xts5/XIproto/OpenDevice.m +++ b/xts5/XIproto/OpenDevice.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent OpenDevice request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong OpenDevice request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/QueryDeviceState.m b/xts5/XIproto/QueryDeviceState.m index 9276a5a0..35e4e9b1 100644 --- a/xts5/XIproto/QueryDeviceState.m +++ b/xts5/XIproto/QueryDeviceState.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryDeviceState request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryDeviceState request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SelectExtensionEvent.m b/xts5/XIproto/SelectExtensionEvent.m index 89a11a6b..44f5d7a6 100644 --- a/xts5/XIproto/SelectExtensionEvent.m +++ b/xts5/XIproto/SelectExtensionEvent.m @@ -128,7 +128,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(KeyMask)) { Log_Err("Required extension devices are not present\n"); @@ -144,18 +144,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SelectExtensionEvent request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SelectExtensionEvent request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SelectExtensionEvent request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SendExtensionEvent.m b/xts5/XIproto/SendExtensionEvent.m index 0b0ffca6..0faa9a80 100644 --- a/xts5/XIproto/SendExtensionEvent.m +++ b/xts5/XIproto/SendExtensionEvent.m @@ -134,7 +134,7 @@ XEventClass dkpc; int dkp, dv; Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(KeyMask)) { Log_Err("Required extension devices are not present\n"); @@ -169,18 +169,18 @@ int dkp, dv; } else { Log_Trace("client %d received DeviceValuator\n", CLIENT); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SendExtensionEvent request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SendExtensionEvent request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SetDeviceButtonMapping.m b/xts5/XIproto/SetDeviceButtonMapping.m index b149084e..921b6bd7 100644 --- a/xts5/XIproto/SetDeviceButtonMapping.m +++ b/xts5/XIproto/SetDeviceButtonMapping.m @@ -161,7 +161,7 @@ XEventClass dbmnc; Log_Trace("client %d received GetDeviceButtonMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); @@ -201,18 +201,18 @@ XEventClass dbmnc; /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetDeviceButtonMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetDeviceButtonMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SetDeviceFocus.m b/xts5/XIproto/SetDeviceFocus.m index 6baabb56..b748afd0 100644 --- a/xts5/XIproto/SetDeviceFocus.m +++ b/xts5/XIproto/SetDeviceFocus.m @@ -149,7 +149,7 @@ tester() Log_Trace("client %d received GetDeviceFocus reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xSetDeviceFocusReq *) Make_XInput_Req(CLIENT, X_SetDeviceFocus); @@ -160,18 +160,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetDeviceFocus request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetDeviceFocus request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetDeviceFocus request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SetDeviceMode.m b/xts5/XIproto/SetDeviceMode.m index 8ff3a4f0..56191a3a 100644 --- a/xts5/XIproto/SetDeviceMode.m +++ b/xts5/XIproto/SetDeviceMode.m @@ -153,18 +153,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetDeviceMode request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetDeviceMode request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SetDeviceModifierMapping.m b/xts5/XIproto/SetDeviceModifierMapping.m index 32e32e74..d3769043 100644 --- a/xts5/XIproto/SetDeviceModifierMapping.m +++ b/xts5/XIproto/SetDeviceModifierMapping.m @@ -164,7 +164,7 @@ XEventClass dmnc; Log_Trace("client %d received GetDeviceModifierMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gmmr); /* ... then make a request to duplicate that mapping. */ @@ -208,18 +208,18 @@ XEventClass dmnc; /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetDeviceModifierMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetDeviceModifierMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/SetDeviceValuators.m b/xts5/XIproto/SetDeviceValuators.m index 9346b6f0..0f48636b 100644 --- a/xts5/XIproto/SetDeviceValuators.m +++ b/xts5/XIproto/SetDeviceValuators.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetDeviceValuators request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetDeviceValuators request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/UngrabDevice.m b/xts5/XIproto/UngrabDevice.m index 3915c274..3699dd78 100644 --- a/xts5/XIproto/UngrabDevice.m +++ b/xts5/XIproto/UngrabDevice.m @@ -131,7 +131,7 @@ void tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(AnyMask)) { Log_Err("Required extension devices are not present\n"); @@ -151,7 +151,7 @@ tester() /* do any reply checking here */ Free_Reply(gprep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gpr); Set_Test_Type(CLIENT, test_type); @@ -161,18 +161,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabDevice request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabDevice request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabDevice request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/UngrabDeviceButton.m b/xts5/XIproto/UngrabDeviceButton.m index 9f372d96..1e5431f9 100644 --- a/xts5/XIproto/UngrabDeviceButton.m +++ b/xts5/XIproto/UngrabDeviceButton.m @@ -129,7 +129,7 @@ void tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(BtnMask)) { Log_Err("Required extension devices are not present\n"); @@ -140,7 +140,7 @@ tester() gbr = (xGrabButtonReq *) Make_XInput_Req(CLIENT, X_GrabDeviceButton); Send_XInput_Req(CLIENT, (xReq *) gbr); Log_Trace("client %d sent default GrabDeviceButton request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gbr); Set_Test_Type(CLIENT, test_type); @@ -150,18 +150,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabDeviceButton request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabDeviceButton request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabDeviceButton request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/XIproto/UngrabDeviceKey.m b/xts5/XIproto/UngrabDeviceKey.m index e3f55fae..2d986357 100644 --- a/xts5/XIproto/UngrabDeviceKey.m +++ b/xts5/XIproto/UngrabDeviceKey.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); if (!Setup_Extension_DeviceInfo(KeyMask)) { Log_Err("Required extension devices are not present\n"); @@ -141,7 +141,7 @@ tester() gkr = (xGrabDeviceKeyReq *) Make_XInput_Req(CLIENT, X_GrabDeviceKey); Send_XInput_Req(CLIENT, (xReq *) gkr); Log_Trace("client %d sent default GrabDeviceKey request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gkr); Set_Test_Type(CLIENT, test_type); @@ -151,18 +151,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabDeviceKey request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabDeviceKey request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabDeviceKey request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xlib10/XAddToSaveSet.m b/xts5/Xlib10/XAddToSaveSet.m index 24435a21..66af09d9 100644 --- a/xts5/Xlib10/XAddToSaveSet.m +++ b/xts5/Xlib10/XAddToSaveSet.m @@ -404,7 +404,7 @@ int i, j; oldy = bt[0][0].y + bt[0][0].borderwidth + cli1btp->y + cli1btp->borderwidth + btp->y; - (void) XGetWindowAttributes(Dsp, btp->wid, &atts); + XGetWindowAttributes(Dsp, btp->wid, &atts); newx = batts.x + batts.border_width + atts.x; newy = batts.y + batts.border_width + atts.y; diff --git a/xts5/Xlib10/XGrabServer.m b/xts5/Xlib10/XGrabServer.m index 37ac8e4d..ee0d1fa8 100644 --- a/xts5/Xlib10/XGrabServer.m +++ b/xts5/Xlib10/XGrabServer.m @@ -158,7 +158,7 @@ static Window win; * and reported as such. There is nothing further that we can * do with it. */ - (void) tet_fork(cproc, pproc, 1, ~0); + tet_fork(cproc, pproc, 1, ~0); /* Test now continues in pproc */ >>EXTERN static void diff --git a/xts5/Xlib11/ButtonPress.m b/xts5/Xlib11/ButtonPress.m index c05c29ae..48d76024 100644 --- a/xts5/Xlib11/ButtonPress.m +++ b/xts5/Xlib11/ButtonPress.m @@ -205,7 +205,7 @@ char *unexpstr = "Unexpected event on a child window."; setarea(&area, 10, 10, 30, 30); w1 = crechild(Dsp, w, &area); w2 = crechild(Dsp, w1, &area); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSelectInput(Dsp, w, EnterWindowMask); XSelectInput(Dsp, w1, EnterWindowMask); @@ -282,7 +282,7 @@ int count; /* Create window. */ w = defwin(display); - (void) warppointer(display, w, PTRX, PTRY); + warppointer(display, w, PTRX, PTRY); XSelectInput(display, w, ALLEVENTS & ~ButtonPressMask); XSync(display, True); /* Generate xname event. */ @@ -428,7 +428,7 @@ int count; /* Create window. */ w = defwin(display); - (void) warppointer(display, w, PTRX, PTRY); + warppointer(display, w, PTRX, PTRY); XSelectInput(display, w, ALLEVENTS & ~ButtonPressMask); XSelectInput(client2, w, ButtonPressMask); XSync(display, True); @@ -504,7 +504,7 @@ XSetWindowAttributes atts; w1 = crechild(Dsp, w, (struct area *) NULL); w2 = crechild(Dsp, w1, (struct area *) NULL); XSelectInput(Dsp, DRW(Dsp), ButtonPressMask); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSync(Dsp, True); buttonpress(Dsp, Button1); @@ -656,7 +656,7 @@ Window w1; w = defwin(Dsp); w1 = crechild(Dsp, w, (struct area *) NULL); XSelectInput(Dsp, w, ButtonPressMask); - (void) warppointer(Dsp, w1, 1,1); + warppointer(Dsp, w1, 1,1); XSync(Dsp, True); buttonpress(Dsp, Button1); @@ -707,7 +707,7 @@ struct area area; setarea(&area, 10, 10, 30, 30); w1 = crechild(Dsp, w, &area); w2 = crechild(Dsp, w1, &area); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSelectInput(Dsp, w, ButtonPressMask); XSync(Dsp, True); @@ -757,7 +757,7 @@ XEvent ev; w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, ButtonPressMask); XSync(Dsp, True); @@ -783,7 +783,7 @@ XEvent ev; } else CHECK; - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSync(Dsp, True); buttonpress(Dsp, Button1); @@ -856,7 +856,7 @@ XEvent ev; w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, ButtonPressMask); w2 = defdraw(Dsp, VI_ALT_WIN); @@ -867,7 +867,7 @@ XEvent ev; } else CHECK; - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSync(Dsp, True); buttonpress(Dsp, Button1); @@ -972,7 +972,7 @@ XEvent ev; w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, ButtonPressMask); w2 = defdraw(Dsp, VI_ALT_WIN); @@ -983,7 +983,7 @@ XEvent ev; } else CHECK; - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSync(Dsp, True); buttonpress(Dsp, Button1); diff --git a/xts5/Xlib11/ButtonRelease.m b/xts5/Xlib11/ButtonRelease.m index 22344f54..5cc1d9c0 100644 --- a/xts5/Xlib11/ButtonRelease.m +++ b/xts5/Xlib11/ButtonRelease.m @@ -359,7 +359,7 @@ int count; /* Create window. */ w = defwin(display); - (void) warppointer(display, w, PTRX, PTRY); + warppointer(display, w, PTRX, PTRY); buttonpress(display, Button1); @@ -440,7 +440,7 @@ XSetWindowAttributes atts; w1 = crechild(Dsp, w, (struct area *) NULL); w2 = crechild(Dsp, w1, (struct area *) NULL); XSelectInput(Dsp, DRW(Dsp), EVENTMASK); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); buttonpress(Dsp, Button1); XSync(Dsp, True); @@ -599,7 +599,7 @@ Window w1; w1 = crechild(Dsp, w, (struct area *) NULL); /* Select xname events on the child. */ XSelectInput(Dsp, w, EVENTMASK); - (void) warppointer(Dsp, w1, 1,1); + warppointer(Dsp, w1, 1,1); /* Simulate a xname event on the child. */ buttonpress(Dsp, Button1); @@ -656,7 +656,7 @@ struct area area; setarea(&area, 10, 10, 30, 30); w1 = crechild(Dsp, w, &area); w2 = crechild(Dsp, w1, &area); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSelectInput(Dsp, w, EVENTMASK); buttonpress(Dsp, Button1); @@ -708,7 +708,7 @@ XEvent ev; w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, EVENTMASK); buttonpress(Dsp, Button1); @@ -735,7 +735,7 @@ XEvent ev; } else CHECK; - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); buttonpress(Dsp, Button1); XSync(Dsp, True); buttonrel(Dsp, Button1); @@ -811,7 +811,7 @@ XEvent ev; /* Create a window. */ w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); /* Select for xname events. */ XSelectInput(Dsp, w, EVENTMASK); @@ -826,7 +826,7 @@ XEvent ev; CHECK; /* Simulate a xname event on the alternate window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); buttonpress(Dsp, Button1); XSync(Dsp, True); buttonrel(Dsp, Button1); @@ -938,7 +938,7 @@ XEvent ev; /* Create a window on the default screen. */ w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); /* Select xname events on the window. */ XSelectInput(Dsp, w, EVENTMASK); @@ -953,7 +953,7 @@ XEvent ev; CHECK; /* Simulate a xname event on the alternate window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); buttonpress(Dsp, Button1); XSync(Dsp, True); buttonrel(Dsp, Button1); diff --git a/xts5/Xlib11/EnterNotify.m b/xts5/Xlib11/EnterNotify.m index eb411e74..44820a77 100644 --- a/xts5/Xlib11/EnterNotify.m +++ b/xts5/Xlib11/EnterNotify.m @@ -704,7 +704,7 @@ is set to >>#REMOVED w2 = defdraw(Dsp, VI_ALT_WIN); >>#REMOVED >>#REMOVED /* Warp the pointer into the first window. */ ->>#REMOVED (void) warppointer(Dsp, wg, 13, 17); +>>#REMOVED warppointer(Dsp, wg, 13, 17); >>#REMOVED XSync(Dsp, True); >>#REMOVED >>#REMOVED /* Grab the pointer for the first window. */ @@ -716,7 +716,7 @@ is set to >>#REMOVED >>#REMOVED /* Warp the pointer into the alternate screen window. */ >>#REMOVED XSync(Dsp, True); ->>#REMOVED (void) warppointer(Dsp, w2, 7,11); +>>#REMOVED warppointer(Dsp, w2, 7,11); >>#REMOVED XSync(Dsp, False); >>#REMOVED >>#REMOVED /* Verify that an xname event was generated relative to the grab window. */ @@ -1315,7 +1315,7 @@ set to >>#REMOVED w2 = defdraw(Dsp, VI_ALT_WIN); >>#REMOVED >>#REMOVED /* Warp the pointer into the first window. */ ->>#REMOVED (void) warppointer(Dsp, wg, 13, 17); +>>#REMOVED warppointer(Dsp, wg, 13, 17); >>#REMOVED XSync(Dsp, True); >>#REMOVED >>#REMOVED /* Grab the pointer for the first window. */ @@ -1327,7 +1327,7 @@ set to >>#REMOVED >>#REMOVED /* Warp the pointer into the alternate screen window. */ >>#REMOVED XSync(Dsp, True); ->>#REMOVED (void) warppointer(Dsp, w2, 7,11); +>>#REMOVED warppointer(Dsp, w2, 7,11); >>#REMOVED XSync(Dsp, False); >>#REMOVED >>#REMOVED /* Verify that an xname event was generated relative to the grab window. */ diff --git a/xts5/Xlib11/KeyPress.m b/xts5/Xlib11/KeyPress.m index 4bc960bb..8439c9d6 100644 --- a/xts5/Xlib11/KeyPress.m +++ b/xts5/Xlib11/KeyPress.m @@ -381,7 +381,7 @@ int kc; XSelectInput(client2, w, EVENTMASK); /* Simulate a xname event on the window. */ - (void) warppointer(display, w, 0, 0); + warppointer(display, w, 0, 0); XSync(display, True); XSync(client2, True); presskey(display, w, kc); @@ -465,7 +465,7 @@ int kc; XSelectInput(Dsp, DRW(Dsp), EVENTMASK); /* Simulate a xname event on the grandchild. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); kc = keycode(); presskey(Dsp, w2, kc); @@ -638,7 +638,7 @@ int kc; w1 = crechild(Dsp, w, (struct area *) NULL); /* Select xname events on the parent. */ XSelectInput(Dsp, w, EVENTMASK); - (void) warppointer(Dsp, w1, 1,1); + warppointer(Dsp, w1, 1,1); /* Simulate a xname event on the child. */ kc=keycode(); @@ -702,7 +702,7 @@ int kc; w2 = crechild(Dsp, w1, &area); /* Create a great-grandchild. */ w3 = crechild(Dsp, w2, &area); - (void) warppointer(Dsp, w3, 1,1); + warppointer(Dsp, w3, 1,1); /* Select xname events on the great-grandparent. */ XSelectInput(Dsp, w, EVENTMASK); @@ -760,7 +760,7 @@ int kc; /* Create a window. */ w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); /* Select xname events on the window. */ XSelectInput(Dsp, w, EVENTMASK); @@ -796,7 +796,7 @@ int kc; CHECK; /* Simulate a xname event on the second window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); presskey(Dsp, w2, kc); /* Verify that a xname event was generated on the grabbing window. */ @@ -875,7 +875,7 @@ int kc; w = defwin(Dsp); /* Select xname events on the window. */ - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, EVENTMASK); /* Create a window on the alternative screen. */ @@ -890,7 +890,7 @@ int kc; kc=keycode(); /* Simulate a xname event on the alternate window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); presskey(Dsp, w2, kc); /* Verify that a xname event was generated on the grabbing window. */ @@ -998,7 +998,7 @@ int kc; w = defwin(Dsp); /* Select xname events on the window. */ - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, EVENTMASK); /* Create a window on the alternative screen. */ @@ -1013,7 +1013,7 @@ int kc; kc=keycode(); /* Simulate a xname event on the alternate window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); presskey(Dsp, w2, kc); /* Verify that a xname event was generated on the grabbing window. */ diff --git a/xts5/Xlib11/KeyRelease.m b/xts5/Xlib11/KeyRelease.m index 04b4caa7..35e36643 100644 --- a/xts5/Xlib11/KeyRelease.m +++ b/xts5/Xlib11/KeyRelease.m @@ -412,7 +412,7 @@ int kc; XSelectInput(client2, w, EVENTMASK); /* Simulate a xname event on the window. */ - (void) warppointer(Dsp, w, 0, 0); + warppointer(Dsp, w, 0, 0); XSync(Dsp, True); XSync(client2, True); @@ -496,7 +496,7 @@ int kc; XSelectInput(Dsp, DRW(Dsp), EVENTMASK); /* Simulate a xname event on the grandchild. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); kc = keycode(); presskey(Dsp, w2, kc); @@ -666,7 +666,7 @@ int kc; w1 = crechild(Dsp, w, (struct area *) NULL); /* Select xname events on the parent. */ XSelectInput(Dsp, w, EVENTMASK); - (void) warppointer(Dsp, w1, 1,1); + warppointer(Dsp, w1, 1,1); /* Simulate a xname event on the child. */ kc=keycode(); @@ -729,7 +729,7 @@ int kc; w2 = crechild(Dsp, w1, &area); /* Create a great-grandchild. */ w3 = crechild(Dsp, w2, &area); - (void) warppointer(Dsp, w3, 1,1); + warppointer(Dsp, w3, 1,1); /* Select xname events on the great-grandparent. */ XSelectInput(Dsp, w, EVENTMASK); @@ -786,7 +786,7 @@ int kc; /* Create a window. */ w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); /* Select xname events on the window. */ XSelectInput(Dsp, w, EVENTMASK); @@ -820,7 +820,7 @@ int kc; CHECK; /* Simulate a xname event on the second window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); presskey(Dsp, w2, kc); /* Verify that a xname event was generated on the grabbing window. */ @@ -900,7 +900,7 @@ int kc; w = defwin(Dsp); /* Select xname events on the window. */ - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); XSelectInput(Dsp, w, EVENTMASK); /* Create a window on the alternative screen. */ @@ -915,7 +915,7 @@ int kc; kc=keycode(); /* Simulate a xname event on the alternate window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); presskey(Dsp, w2, kc); /* Verify that a xname event was generated on the grabbing window. */ @@ -1020,7 +1020,7 @@ int kc; /* Create a window on the default screen. */ w = defwin(Dsp); - (void) warppointer(Dsp, w, 1,1); + warppointer(Dsp, w, 1,1); /* Select xname events on the window. */ XSelectInput(Dsp, w, EVENTMASK); @@ -1036,7 +1036,7 @@ int kc; kc=keycode(); /* Simulate a xname event on the alternate window. */ - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); presskey(Dsp, w2, kc); /* Verify that a xname event was generated on the grabbing window. */ diff --git a/xts5/Xlib11/LeaveNotify.m b/xts5/Xlib11/LeaveNotify.m index 38dffbe6..ea23bb4d 100644 --- a/xts5/Xlib11/LeaveNotify.m +++ b/xts5/Xlib11/LeaveNotify.m @@ -241,7 +241,7 @@ PointerPlace *warp; area.y = 0; area.width = W_STDWIDTH; area.height = W_STDHEIGHT; - (void) mkwin(display, (XVisualInfo *) NULL, &area, True); + mkwin(display, (XVisualInfo *) NULL, &area, True); /* Create window2 on top of window1. */ w2 = mkwin(display, (XVisualInfo *) NULL, &area, True); /* Select for xname and UnmapNotify events on window2. */ @@ -781,7 +781,7 @@ int gr; w2 = defdraw(Dsp, VI_ALT_WIN); /* Warp the pointer into the first window. */ - (void) warppointer(Dsp, w, 2,3); + warppointer(Dsp, w, 2,3); /* Grab the pointer for the first window. */ if((gr=XGrabPointer(Dsp, w, False, EVENTMASK, GrabModeAsync, GrabModeAsync, None, None, CurrentTime)) != GrabSuccess) { @@ -792,7 +792,7 @@ int gr; /* Warp the pointer to the alternate window. */ XSync(Dsp, True); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSync(Dsp, False); /* Verify that an xname event was generated relative to the grab window. */ @@ -1518,7 +1518,7 @@ int gr; w2 = defdraw(Dsp, VI_ALT_WIN); /* Warp the pointer into the first window. */ - (void) warppointer(Dsp, w, 2,3); + warppointer(Dsp, w, 2,3); /* Grab the pointer for the first window. */ if((gr=XGrabPointer(Dsp, w, False, EVENTMASK, GrabModeAsync, GrabModeAsync, None, None, CurrentTime)) != GrabSuccess) { @@ -1529,7 +1529,7 @@ int gr; /* Warp the pointer to the alternate window. */ XSync(Dsp, True); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); XSync(Dsp, False); /* Verify that an xname event was generated relative to the grab window. */ diff --git a/xts5/Xlib11/MotionNotify.m b/xts5/Xlib11/MotionNotify.m index 947e3dbb..54f98369 100644 --- a/xts5/Xlib11/MotionNotify.m +++ b/xts5/Xlib11/MotionNotify.m @@ -332,7 +332,7 @@ PointerPlace *ptr; XSelectInput(client2, w, Button1MotionMask); XSelectInput(client3, w, Button1MotionMask); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); XSync(client2, True); XSync(client3, True); @@ -463,7 +463,7 @@ PointerPlace *ptr; XSelectInput(client2, w, Button2MotionMask); XSelectInput(client3, w, Button2MotionMask); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); XSync(client2, True); XSync(client3, True); @@ -594,7 +594,7 @@ PointerPlace *ptr; XSelectInput(client2, w, Button3MotionMask); XSelectInput(client3, w, Button3MotionMask); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); XSync(client2, True); XSync(client3, True); @@ -725,7 +725,7 @@ PointerPlace *ptr; XSelectInput(client2, w, Button4MotionMask); XSelectInput(client3, w, Button4MotionMask); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); XSync(client2, True); XSync(client3, True); @@ -856,7 +856,7 @@ PointerPlace *ptr; XSelectInput(client2, w, Button5MotionMask); XSelectInput(client3, w, Button5MotionMask); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); XSync(client2, True); XSync(client3, True); @@ -987,7 +987,7 @@ PointerPlace *ptr; XSelectInput(client2, w, ButtonMotionMask); XSelectInput(client3, w, ButtonMotionMask); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); XSync(client2, True); XSync(client3, True); @@ -1120,10 +1120,10 @@ XEvent ev; XSelectInput(Dsp, w, MOTIONMASK); /* Simulate a Motion event with Button1 depressed on the window. */ - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); buttonpress(Dsp, Button1); - (void) warppointer(Dsp, w, 10, 10); + warppointer(Dsp, w, 10, 10); XSync(Dsp, False); buttonrel(Dsp, Button1); @@ -1161,9 +1161,9 @@ XEvent ev; buttonpress(Dsp, Button5); - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, True); - (void) warppointer(Dsp, w, 10, 10); + warppointer(Dsp, w, 10, 10); XSync(Dsp, False); for(i=0; i < NELEM(motionmasks); i++) { @@ -1267,12 +1267,12 @@ int i; XSelectInput(Dsp, w, buttonmask[i]); /* Simulate the motion event. */ - (void) warppointer(Dsp, w, 0,0); + warppointer(Dsp, w, 0,0); XSync(Dsp, False); XSync(client2, False); if(buttonmask[i] != PointerMotionMask) buttonpress(Dsp, buttons[i]); - (void) warppointer(Dsp, w, 10,10); + warppointer(Dsp, w, 10,10); XSync(Dsp, False); XSync(client2, False); @@ -1611,11 +1611,11 @@ int i; XSelectInput(Dsp, DRW(Dsp), buttonmask[i]); /* Simulate a xname event on the grandchild. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, False); if(buttonmask[i] != PointerMotionMask) buttonpress(Dsp, buttons[i]); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); if(buttonmask[i] != PointerMotionMask) buttonrel(Dsp, buttons[i]); XSync(Dsp, False); @@ -1637,11 +1637,11 @@ int i; XChangeWindowAttributes(Dsp, w1, CWDontPropagate, &atts); /* Simulate a xname event on the grandchild. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, False); if(buttonmask[i] != PointerMotionMask) buttonpress(Dsp, buttons[i]); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); if(buttonmask[i] != PointerMotionMask) buttonrel(Dsp, buttons[i]); XSync(Dsp, False); @@ -1675,11 +1675,11 @@ int i; XChangeWindowAttributes(Dsp, w1, CWDontPropagate, &atts); /* Simulate a xname event on the grandchild. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, False); if(buttonmask[i] != PointerMotionMask) buttonpress(Dsp, buttons[i]); - (void) warppointer(Dsp, w2, 1,1); + warppointer(Dsp, w2, 1,1); if(buttonmask[i] != PointerMotionMask) buttonrel(Dsp, buttons[i]); XSync(Dsp, False); @@ -2069,9 +2069,9 @@ XEvent ev; CHECK; /* Generate a PointerMotion event on the alternate window. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, True); - (void) warppointer(Dsp, w2, 10, 10); + warppointer(Dsp, w2, 10, 10); XSync(Dsp, False); /* Verify that a PointerMotion event was generated with respect to the grabbing window. */ @@ -2090,10 +2090,10 @@ XEvent ev; } /* Generate a ButtonMotion mask on the alternate window. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, True); buttonpress(Dsp, Button1); - (void) warppointer(Dsp, w2, 10, 10); + warppointer(Dsp, w2, 10, 10); XSync(Dsp, False); buttonrel(Dsp, Button1); @@ -2210,9 +2210,9 @@ XEvent ev; CHECK; /* Generate a PointerMotion event on the alternate window. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, True); - (void) warppointer(Dsp, w2, 10, 10); + warppointer(Dsp, w2, 10, 10); XSync(Dsp, False); /* Verify that a PointerMotion event was generated with respect to the grabbing window. */ @@ -2230,10 +2230,10 @@ XEvent ev; } /* Generate a ButtonMotion event on the alternate window. */ - (void) warppointer(Dsp, w2, 0,0); + warppointer(Dsp, w2, 0,0); XSync(Dsp, True); buttonpress(Dsp, Button1); - (void) warppointer(Dsp, w2, 10, 10); + warppointer(Dsp, w2, 10, 10); XSync(Dsp, False); buttonrel(Dsp, Button1); diff --git a/xts5/Xlib12/XDisplayName/XDisplayName.m b/xts5/Xlib12/XDisplayName/XDisplayName.m index 74a4482e..ff9ea2d6 100644 --- a/xts5/Xlib12/XDisplayName/XDisplayName.m +++ b/xts5/Xlib12/XDisplayName/XDisplayName.m @@ -181,7 +181,7 @@ char *mstr = "DISPLAY=%s"; return; } - (void) tet_exec("./Test1", argv, environ); + tet_exec("./Test1", argv, environ); delete("Exec of file ./Test1 failed"); free( (char *) str); diff --git a/xts5/Xlib12/XGetErrorDatabaseText.m b/xts5/Xlib12/XGetErrorDatabaseText.m index d63feb88..0b2d98ac 100644 --- a/xts5/Xlib12/XGetErrorDatabaseText.m +++ b/xts5/Xlib12/XGetErrorDatabaseText.m @@ -190,7 +190,7 @@ char msgbuf[512]; /* Set name to "XProtoError". */ name = "XProtoError"; /* Set message to the string representation of BadWindow. */ - (void) sprintf(msgbuf, "%d", BadWindow); + sprintf(msgbuf, "%d", BadWindow); message = msgbuf; /* Call XGetErrorText. */ XCALL; @@ -241,7 +241,7 @@ char msgbuf[512]; /* Set name to "XRequest". */ name = "XRequest"; /* Set message to the string representation of X_DestroyWindow. */ - (void) sprintf(msgbuf, "%d", X_DestroyWindow); + sprintf(msgbuf, "%d", X_DestroyWindow); message = msgbuf; /* Call XGetErrorText. */ XCALL; diff --git a/xts5/Xlib12/XSendEvent.m b/xts5/Xlib12/XSendEvent.m index 8296b771..26eb5a13 100644 --- a/xts5/Xlib12/XSendEvent.m +++ b/xts5/Xlib12/XSendEvent.m @@ -267,15 +267,15 @@ Window wtmp; /* useless XQueryPointer return values */ /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Save initial pointer location. */ - (void) XQueryPointer(display, ptrwin, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, ptrwin, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to window. */ XWarpPointer(display, None, ptrwin, 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, ptrwin, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -291,7 +291,7 @@ Window wtmp; /* useless XQueryPointer return values */ /* Get current pointer location. */ if (XQueryPointer(display, ptrwin, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -310,7 +310,7 @@ Window wtmp; /* useless XQueryPointer return values */ /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendEvent returned non-zero. */ @@ -416,18 +416,18 @@ struct area a; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to parent window. */ XSetInputFocus(display, parent, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to inferior of focus window. */ XWarpPointer(display, None, child, 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -444,7 +444,7 @@ struct area a; /* Get current pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -463,7 +463,7 @@ struct area a; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendEvent returned non-zero. */ @@ -972,18 +972,18 @@ struct area a; /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to parent window. */ XSetInputFocus(display, parent, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, child, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to inferior of focus window. */ XWarpPointer(display, None, child, 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -1000,7 +1000,7 @@ struct area a; /* Get current pointer location. */ if (XQueryPointer(display, child, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -1019,7 +1019,7 @@ struct area a; /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendEvent returned non-zero. */ @@ -1117,18 +1117,18 @@ Window wtmp; /* useless XQueryPointer return values */ /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to new focus window. */ XSetInputFocus(display, nfocus, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer away from inferior of focus window; to root. */ XWarpPointer(display, None, DRW(display), 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -1147,7 +1147,7 @@ Window wtmp; /* useless XQueryPointer return values */ /* Get current pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -1166,7 +1166,7 @@ Window wtmp; /* useless XQueryPointer return values */ /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendEvent returned non-zero. */ @@ -1191,18 +1191,18 @@ Window wtmp; /* useless XQueryPointer return values */ /* Grab server. */ XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Set input focus to new focus window. */ XSetInputFocus(display, nfocus, RevertToPointerRoot, CurrentTime); /* Save initial pointer location. */ - (void) XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, nfocus, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer away from inferior of focus window; to root. */ XWarpPointer(display, None, DRW(display), 0, 0, 0, 0, 0, 0); /* Get new pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer on wrong root."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } else @@ -1213,7 +1213,7 @@ Window wtmp; /* useless XQueryPointer return values */ /* Get current pointer location. */ if (XQueryPointer(display, nfocus, &wtmp, &wtmp, &root_x, &root_y, &itmp, &itmp, &uitmp) == False) { delete("Pointer moved."); - (void) XSynchronize(display, False); + XSynchronize(display, False); XUngrabServer(display); return; } @@ -1232,7 +1232,7 @@ Window wtmp; /* useless XQueryPointer return values */ /* Warp pointer back to where it started. */ XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); /* Verify that XSendEvent returned non-zero. */ diff --git a/xts5/Xlib12/XSetAfterFunction.m b/xts5/Xlib12/XSetAfterFunction.m index 468f292e..098436fd 100644 --- a/xts5/Xlib12/XSetAfterFunction.m +++ b/xts5/Xlib12/XSetAfterFunction.m @@ -134,7 +134,7 @@ int oldcounter; oldcounter = counter; /* Create window. */ - (void) mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); + mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); /* Verify that afterfunction was not called. */ if (counter != oldcounter) { delete("After function already set to afterfunction."); @@ -143,9 +143,9 @@ int oldcounter; else CHECK; /* Call XSetAfterFunction to set the after function to afterfunction. */ - (void) XCALL; + XCALL; /* Create window. */ - (void) mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); + mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); /* Verify that the after function was called. */ if (counter == oldcounter) { report("After function not called."); @@ -168,7 +168,7 @@ int (*proc)(); /* Call XSetAfterFunction to set after function to afterfunction. */ procedure = afterfunction; - (void) XCALL; + XCALL; /* Call XSetAfterFunction to set after function to _afterfunction. */ procedure = _afterfunction; proc = XCALL; diff --git a/xts5/Xlib12/XSetErrorHandler.m b/xts5/Xlib12/XSetErrorHandler.m index dfb7a992..8d484c77 100644 --- a/xts5/Xlib12/XSetErrorHandler.m +++ b/xts5/Xlib12/XSetErrorHandler.m @@ -307,8 +307,8 @@ FILE *fp; if (waitstatus != child) { report("Child did not exit."); FAIL; - (void) kill(child, SIGKILL); - (void) waitpid(child, &stat_loc, WNOHANG); + kill(child, SIGKILL); + waitpid(child, &stat_loc, WNOHANG); } else CHECK; diff --git a/xts5/Xlib12/XSetIOErrorHandler.m b/xts5/Xlib12/XSetIOErrorHandler.m index 18615669..7c65d35b 100644 --- a/xts5/Xlib12/XSetIOErrorHandler.m +++ b/xts5/Xlib12/XSetIOErrorHandler.m @@ -371,8 +371,8 @@ FILE *fp; if (waitstatus != child) { report("Child did not exit."); FAIL; - (void) kill(child, SIGKILL); - (void) waitpid(child, &stat_loc, WNOHANG); + kill(child, SIGKILL); + waitpid(child, &stat_loc, WNOHANG); } else CHECK; diff --git a/xts5/Xlib12/XSynchronize.m b/xts5/Xlib12/XSynchronize.m index ec1bbb6a..6dfa4f09 100644 --- a/xts5/Xlib12/XSynchronize.m +++ b/xts5/Xlib12/XSynchronize.m @@ -141,7 +141,7 @@ int (*proc)(); /* Call XSynchronize with onoff set to True. */ onoff = True; - (void) XCALL; + XCALL; /* Call XSetAfterFunction to get value of old after function. */ proc = XSetAfterFunction(display, afterfunction); /* Verify that XSetAfterFunction returned non-NULL. */ @@ -168,7 +168,7 @@ int (*proc)(); /* Call XSynchronize with onoff set to False. */ onoff = False; - (void) XCALL; + XCALL; /* Call XSetAfterFunction to get value of old after function. */ proc = XSetAfterFunction(display, afterfunction); /* Verify that XSetAfterFunction returned NULL. */ @@ -193,7 +193,7 @@ Verify that XSynchronize returned afterfunction. int (*proc)(); /* Call XSetAfterFunction to set after function to afterfunction. */ - (void) XSetAfterFunction(display, afterfunction); + XSetAfterFunction(display, afterfunction); /* Call XSynchronize with onoff set to False. */ onoff = False; proc = XCALL; @@ -205,7 +205,7 @@ int (*proc)(); else CHECK; /* Call XSetAfterFunction to set after function to afterfunction. */ - (void) XSetAfterFunction(display, afterfunction); + XSetAfterFunction(display, afterfunction); /* Call XSynchronize with onoff set to True. */ onoff = True; proc = XCALL; diff --git a/xts5/Xlib13/XAllowEvents.m b/xts5/Xlib13/XAllowEvents.m index a71b63e5..cce441d0 100644 --- a/xts5/Xlib13/XAllowEvents.m +++ b/xts5/Xlib13/XAllowEvents.m @@ -148,7 +148,7 @@ Display *disp; { PointerPlace *pp; - (void) warppointer(disp, grabwin, 0, 0); + warppointer(disp, grabwin, 0, 0); pp = warppointer(disp, grabwin, 1, 1); if (pp->ox == pp->nx) return True; @@ -449,7 +449,7 @@ struct area area; * Activate the grab. */ XSync(display, True); /* Discard any events */ - (void) warppointer(display, chwin, 1, 1); + warppointer(display, chwin, 1, 1); buttonpress(display, Button1); /* @@ -541,7 +541,7 @@ int key; return; grabwin = defwin(display); - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); key = getkeycode(display); XGrabKey(display, key, 0, grabwin, False, GrabModeSync, GrabModeAsync); @@ -599,7 +599,7 @@ int key; */ win = defwin(display); XSelectInput(display, win, KeyPressMask); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 1, 1); keypress(display, key); if (XCheckMaskEvent(display, (long)KeyPressMask, &ev)) res = False; @@ -885,7 +885,7 @@ int key; XGrabKey(display, key, 0, win, False, GrabModeAsync, GrabModeSync); XGrabKey(display, key, 0, chwin, False, GrabModeAsync, GrabModeSync); - (void) warppointer(display, chwin, 1, 1); + warppointer(display, chwin, 1, 1); XSync(display, True); /* This should activate the grab */ @@ -980,7 +980,7 @@ int key; XGrabKey(display, key, 0, win, False, GrabModeAsync, GrabModeAsync); XGrabKey(display, key, 0, chwin, False, GrabModeAsync, GrabModeAsync); - (void) warppointer(display, chwin, 1, 1); + warppointer(display, chwin, 1, 1); XSync(display, True); /* This should activate the grab */ @@ -1035,7 +1035,7 @@ int key; return; grabwin = defwin(display); - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); XGrabButton(display, Button1, 0, grabwin, False, PointerMotionMask, GrabModeSync, GrabModeAsync, @@ -1166,7 +1166,7 @@ int bothset() grabwin = defwin(display); XSelectInput(display, grabwin, ButtonPressMask|ButtonReleaseMask|KeyPressMask|KeyReleaseMask); - (void) warppointer(display, grabwin, 5, 5); + warppointer(display, grabwin, 5, 5); /* this grabs the pointer AND ALL OTHER DEVICES */ XGrabPointer(display, grabwin, False, @@ -1333,7 +1333,7 @@ If extension available: False, PointerMotionMask, GrabModeSync, GrabModeAsync, None, None); - (void) warppointer(display, grabwin, 1, 1); + warppointer(display, grabwin, 1, 1); buttonpress(display, Button1); if (ispfrozen(display)) diff --git a/xts5/Xlib13/XChangeActivePointerGrab.m b/xts5/Xlib13/XChangeActivePointerGrab.m index ef38c9d6..82a3d478 100644 --- a/xts5/Xlib13/XChangeActivePointerGrab.m +++ b/xts5/Xlib13/XChangeActivePointerGrab.m @@ -119,15 +119,15 @@ Verify that now only motion events are reported. XEvent ev; Window win; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); win = defwin(display); XGrabPointer(display, win, False, EnterWindowMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 0, 0); + warppointer(display, win, 2, 2); /* * This is just a check to see that the grab is behaving as expected. @@ -147,13 +147,13 @@ Window win; return; } - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); XCALL; XSync(display, True); /* Flush any remaining event */ - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 0, 0); + warppointer(display, win, 2, 2); if (isdeleted()) return; @@ -189,7 +189,7 @@ XEvent ev; Window win; Time t; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); win = defwin(display); t = gettime(Dsp); @@ -202,8 +202,8 @@ Time t; XCALL; XSync(display, True); /* Flush any event */ - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 0, 0); + warppointer(display, win, 2, 2); if (isdeleted()) return; @@ -220,7 +220,7 @@ Time t; FAIL; } - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); /* Later than X server time */ t = gettime(Dsp); @@ -228,8 +228,8 @@ Time t; XCALL; XSync(display, True); /* Flush any event */ - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 0, 0); + warppointer(display, win, 2, 2); if (isdeleted()) return; @@ -294,9 +294,9 @@ Window win; XSelectInput(client2, win, PointerMotionMask); XSync(client2, True); p = warppointer(client2, win, 1,1); - (void) warppointer(client2, win, 10,10); - (void) warppointer(client2, win, 1,1); - (void) warppointer(client2, p->oroot, p->ox, p->oy); + warppointer(client2, win, 10,10); + warppointer(client2, win, 1,1); + warppointer(client2, p->oroot, p->ox, p->oy); return (!getevent(client2, &ev)); } >>CODE @@ -319,9 +319,9 @@ Cursor cur; } else CHECK; XSync(display, True); - (void) warppointer(display, win, 1,1); - (void) warppointer(display, win, 10,10); - (void) warppointer(display, win, 1,1); + warppointer(display, win, 1,1); + warppointer(display, win, 10,10); + warppointer(display, win, 1,1); if (n=getevent(display, &ev)) { delete("Unexpectedly received %d events, first was type %s.", n, eventname(ev.type)); @@ -332,9 +332,9 @@ Cursor cur; cursor = cur; XCALL; XSync(display, True); - (void) warppointer(display, win, 1,1); - (void) warppointer(display, win, 10,10); - (void) warppointer(display, win, 1,1); + warppointer(display, win, 1,1); + warppointer(display, win, 10,10); + warppointer(display, win, 1,1); if (n=getevent(display, &ev)) { report("event_mask changed passive grab, received %d events, first was type %s.", n, eventname(ev.type)); @@ -358,9 +358,9 @@ Cursor cur; return; } XSync(display, True); - (void) warppointer(display, win, 1,1); - (void) warppointer(display, win, 10,10); - (void) warppointer(display, win, 1,1); + warppointer(display, win, 1,1); + warppointer(display, win, 10,10); + warppointer(display, win, 1,1); if (n=getevent(display, &ev)) { report("event_mask changed on grab activation, received %d events, first was type %s.", n, eventname(ev.type)); @@ -376,9 +376,9 @@ Cursor cur; cursor = cur; XCALL; XSync(display, True); - (void) warppointer(display, win, 1,1); - (void) warppointer(display, win, 10,10); - (void) warppointer(display, win, 1,1); + warppointer(display, win, 1,1); + warppointer(display, win, 10,10); + warppointer(display, win, 1,1); if (!(n=getevent(display, &ev)) || ev.type != MotionNotify) { report("event_mask not changed properly for active grab."); if (n) diff --git a/xts5/Xlib13/XGetModifierMapping.m b/xts5/Xlib13/XGetModifierMapping.m index 7ae8e270..78083b43 100644 --- a/xts5/Xlib13/XGetModifierMapping.m +++ b/xts5/Xlib13/XGetModifierMapping.m @@ -163,8 +163,8 @@ Window win; XSync(display, True); XSelectInput(display, win, PointerMotionMask); p = warppointer(display, win, 0,0); - (void) warppointer(display, win, 10,10); - (void) warppointer(display, p->oroot, p->ox, p->oy); + warppointer(display, win, 10,10); + warppointer(display, p->oroot, p->ox, p->oy); result = (getevent(display, &ev) == 0); XSync(display, True); return result; @@ -228,7 +228,7 @@ int non_zero = 0; return; } else CHECK; - (void) warppointer(display, win, 2,2); /* pgrabbed restores pointer */ + warppointer(display, win, 2,2); /* pgrabbed restores pointer */ for(k=minkc; k <= maxkc; k++) { keypress(display, k); buttonpress(display, Button1); diff --git a/xts5/Xlib13/XGetPointerMapping.m b/xts5/Xlib13/XGetPointerMapping.m index 5d92ceac..3c517970 100644 --- a/xts5/Xlib13/XGetPointerMapping.m +++ b/xts5/Xlib13/XGetPointerMapping.m @@ -159,7 +159,7 @@ Window win; return; } else CHECK; - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 2, 2); for (i=0; i<nbuttons; i++) { XEvent ev; diff --git a/xts5/Xlib13/XGrabButton.m b/xts5/Xlib13/XGrabButton.m index dac8535f..1d65d7a6 100644 --- a/xts5/Xlib13/XGrabButton.m +++ b/xts5/Xlib13/XGrabButton.m @@ -140,8 +140,8 @@ XEvent ev; /* * Ensure that pointer either enters or moves within win. */ - (void) warppointer(display, win, 1, 1); - (void) warppointer(display, win, 1, 2); + warppointer(display, win, 1, 1); + warppointer(display, win, 1, 2); XSync(client2, False); if (getevent(client2, &ev)) { @@ -194,7 +194,7 @@ Bool s; static activate() { - (void) warppointer(display, grab_window, ACTPOSX, ACTPOSY); + warppointer(display, grab_window, ACTPOSX, ACTPOSY); if (modifiers) modpress(display, modifiers); buttonpress(display, button); @@ -219,8 +219,8 @@ Window win; win = defwin(display); XSelectInput(display, win, PointerMotionMask); - (void) warppointer(display, win, 1, 1); - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 1, 1); + warppointer(display, win, 2, 2); if (XCheckMaskEvent(display, (long)PointerMotionMask, &ev)) return False; else @@ -248,7 +248,7 @@ int res; */ win = defwin(display); XSelectInput(display, win, KeyPressMask); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 1, 1); keypress(display, minkc); if (XCheckMaskEvent(display, (long)KeyPressMask, &ev)) res = False; @@ -336,7 +336,7 @@ int onemod; button = Button1; XCALL; - (void) warppointer(display, grab_window, 2, 2); + warppointer(display, grab_window, 2, 2); buttonpress(display, button+1); buttonpress(display, button); if (pgrabbed()) { @@ -383,7 +383,7 @@ int onemod; grab_window = defwin(display); XCALL; - (void) warppointer(display, grab_window, 2, 2); + warppointer(display, grab_window, 2, 2); /* Pressing an extra modifier */ modpress(display, mask); buttonpress(display, button); @@ -547,8 +547,8 @@ XEvent ev; * have become active on the parent -- therefore we expect the events * to show up on the parent. */ - (void) warppointer(display, grab_window, 1, 1); - (void) warppointer(display, grab_window, 8, 8); + warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 8, 8); /* * Since no events are selected on the windows, any event must @@ -596,7 +596,7 @@ int n; XSelectInput(display, grab_window, ALLEVENTS); - (void) warppointer(display, grab_window, ACTPOSX, ACTPOSY); + warppointer(display, grab_window, ACTPOSX, ACTPOSY); XSync(display, True); /* Discard any events */ buttonpress(display, button); @@ -864,7 +864,7 @@ int i; } else CHECK; - (void) warppointer(display, grab_window, 10, 10); + warppointer(display, grab_window, 10, 10); for (i = 0; i < NS_button; i++) { buttonpress(display, (unsigned int)S_button[i].val); @@ -980,8 +980,8 @@ XMotionEvent *mp; win = defwin(display); XSelectInput(display, win, PointerMotionMask); - (void) warppointer(display, win, 1, 2); - (void) warppointer(display, win, 2, 3); + warppointer(display, win, 1, 2); + warppointer(display, win, 2, 3); if (getevent(display, &ev) == 0) { report("No events received"); @@ -1046,8 +1046,8 @@ XMotionEvent *mp; win = defwin(display); XSelectInput(display, win, PointerMotionMask); - (void) warppointer(display, win, 1, 2); - (void) warppointer(display, win, 1, 6); + warppointer(display, win, 1, 2); + warppointer(display, win, 1, 6); if (getevent(display, &ev) == 0) { report("No events received"); @@ -1113,8 +1113,8 @@ XMotionEvent *mp; XSync(display, True); win = defwin(display); - (void) warppointer(display, win, 1, 2); - (void) warppointer(display, win, 4, 12); + warppointer(display, win, 1, 2); + warppointer(display, win, 4, 12); if (getevent(display, &ev) == 0) { report("No events received"); @@ -1333,7 +1333,7 @@ XEvent ev; activate(); XSync(display, True); /* Flush events */ - (void) warppointer(display, grab_window, ACTPOSX+3, ACTPOSY+4); + warppointer(display, grab_window, ACTPOSX+3, ACTPOSY+4); if (XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("Pointer event was received while pointer was frozen"); trace("ev.type = %s", eventname(ev.type)); @@ -1369,7 +1369,7 @@ XEvent ev; activate(); XSync(display, True); - (void) warppointer(display, grab_window, ACTPOSX+3, ACTPOSY+4); + warppointer(display, grab_window, ACTPOSX+3, ACTPOSY+4); if (XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("Pointer event was received while pointer was frozen"); trace("ev.type = %s", eventname(ev.type)); @@ -1845,7 +1845,7 @@ XLeaveWindowEvent leavegood; owner_events = True; XCALL; - (void) warppointer(display, grab_window, ACTPOSX, ACTPOSY); + warppointer(display, grab_window, ACTPOSX, ACTPOSY); XSync(display, True); /* Discard events so far */ buttonpress(display, button); @@ -1932,7 +1932,7 @@ struct area area; if (noext(1)) return; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); /* * This time make confine_to a child of grab_window, also make it small @@ -2110,8 +2110,8 @@ XEvent ev; /* This sets the grab on grab_window */ XCALL; - (void) warppointer(display, grab_window, 1, 1); - (void) warppointer(display, grab_window, 3, 3); + warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 3, 3); if (getevent(display, &ev) < 1) { delete("Could not get motion event"); @@ -2159,7 +2159,7 @@ XEvent ev; if (noext(1)) return; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); client2 = opendisplay(); win = defwin(display); @@ -2178,7 +2178,7 @@ XEvent ev; * If the grab has been released then this will generate * an event for client2. */ - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (XCheckWindowEvent(client2, win, (long)PointerMotionMask|EnterWindowMask, &ev)) @@ -2199,7 +2199,7 @@ XEvent ev; XUnmapWindow(display, confine_to); /* Warp to win and check for events on client2 */ - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (XCheckWindowEvent(client2, win, (long)PointerMotionMask|EnterWindowMask, &ev)) @@ -2232,7 +2232,7 @@ XEvent ev; if (noext(1)) return; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); client2 = opendisplay(); @@ -2246,7 +2246,7 @@ XEvent ev; activate(); XMoveWindow(display, confine_to, -9000, -9000); - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (isdeleted()) diff --git a/xts5/Xlib13/XGrabKeyboard.m b/xts5/Xlib13/XGrabKeyboard.m index a41b6ef4..f520426c 100644 --- a/xts5/Xlib13/XGrabKeyboard.m +++ b/xts5/Xlib13/XGrabKeyboard.m @@ -237,7 +237,7 @@ XEvent ev; XCALL; - (void) warppointer(client2, grab_window, 1, 1); + warppointer(client2, grab_window, 1, 1); keypress(display, getkeycode(display)); if (XCheckMaskEvent(display, KeyPressMask, &ev)) @@ -312,7 +312,7 @@ XEvent ev; owner_events = False; XCALL; - (void) warppointer(display, window2, 1, 1); + warppointer(display, window2, 1, 1); keypress(display, getkeycode(display)); if (XCheckWindowEvent(display, grab_window, KeyPressMask, &ev)) @@ -358,7 +358,7 @@ XEvent ev; owner_events = True; XCALL; - (void) warppointer(display, window2, 1, 1); + warppointer(display, window2, 1, 1); keypress(display, getkeycode(display)); if (XCheckWindowEvent(display, window2, KeyPressMask, &ev)) @@ -403,7 +403,7 @@ XEvent ev; owner_events = True; XCALL; - (void) warppointer(display, window2, 1, 1); + warppointer(display, window2, 1, 1); keypress(display, getkeycode(display)); if (XCheckWindowEvent(display, grab_window, KeyPressMask, &ev)) @@ -442,7 +442,7 @@ int key; XCALL; - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); key = getkeycode(display); keypress(display, key); @@ -490,7 +490,7 @@ static int key; /* * Try to provoke a keypress on grab_window. */ - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); keypress(display, key); if (XCheckMaskEvent(display, (long)KeyPressMask, &ev)) res = False; @@ -617,7 +617,7 @@ XEvent ev; keyboard_mode = GrabModeSync; XCALL; - (void) warppointer(display, grab_window, 10, 10); + warppointer(display, grab_window, 10, 10); keypress(display, key); keyrel(display, key); @@ -638,7 +638,7 @@ XEvent ev; FAIL; } else { first = ev.type; - (void) getevent(display, &ev); + getevent(display, &ev); /* (We have already checked that there is another event) */ if (ev.type != KeyPress && first != KeyPress) { @@ -676,12 +676,12 @@ XEvent ev; Window win; win = defwin(Dsp); - (void) warppointer(Dsp, win, 0, 0); + warppointer(Dsp, win, 0, 0); XSync(Dsp, True); /* discard events */ XSelectInput(Dsp, win, PointerMotionMask); - (void) warppointer(Dsp, win, 1, 4); + warppointer(Dsp, win, 1, 4); XSync(Dsp, False); if (XCheckWindowEvent(Dsp, win, PointerMotionMask, &ev)) @@ -745,13 +745,13 @@ Verify that events are now received. >>CODE XEvent ev; - (void) warppointer(display, grab_window, 0, 0); + warppointer(display, grab_window, 0, 0); XSelectInput(display, grab_window, PointerMotionMask); pointer_mode = GrabModeSync; XCALL; - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); XSync(display, False); /* warppointer has effectivly done this */ if (!XCheckWindowEvent(display, grab_window, PointerMotionMask, &ev)) CHECK; diff --git a/xts5/Xlib13/XGrabPointer.m b/xts5/Xlib13/XGrabPointer.m index 35d04ac4..9f1b5a14 100644 --- a/xts5/Xlib13/XGrabPointer.m +++ b/xts5/Xlib13/XGrabPointer.m @@ -177,7 +177,7 @@ XEvent ev; client2 = opendisplay(); grab_window = defwin(display); - (void) warppointer(display, grab_window, 0, 0); + warppointer(display, grab_window, 0, 0); XSelectInput(display, grab_window, PointerMotionMask); XSelectInput(client2, grab_window, PointerMotionMask); @@ -185,7 +185,7 @@ XEvent ev; XCALL; - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); if (getevent(display, &ev) == 0 || ev.type != MotionNotify) { report("No pointer event occurred on the grabbing client"); @@ -212,7 +212,7 @@ Verify that pointer is within the other window. Window w1, w2; /* Move pointer, mainly so that its position will be restored */ - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); w1 = defwin(display); w2 = defwin(display); @@ -267,11 +267,11 @@ XMotionEvent *mp; event_mask = PointerMotionMask; win = defwin(display); - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); XCALL; - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 0, 0); + warppointer(display, win, 1, 1); if (!XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("No pointer event was received"); @@ -316,11 +316,11 @@ XMotionEvent *mp; owner_events = True; XSelectInput(display, window2, PointerMotionMask); - (void) warppointer(display, window2, 0, 0); + warppointer(display, window2, 0, 0); XCALL; - (void) warppointer(display, window2, 1, 0); + warppointer(display, window2, 1, 0); if (!XCheckMaskEvent(display, PointerMotionMask, &ev)) { delete("No pointer event was received"); @@ -371,11 +371,11 @@ XMotionEvent *mp; owner_events = True; event_mask = PointerMotionMask; - (void) warppointer(display, window2, 0, 0); + warppointer(display, window2, 0, 0); XCALL; - (void) warppointer(display, window2, 1, 0); + warppointer(display, window2, 1, 0); if (!XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("No pointer event was received"); @@ -413,11 +413,11 @@ XEvent ev; grab_window = defwin(display); event_mask = PointerMotionMask; pointer_mode = GrabModeAsync; - (void) warppointer(display, grab_window, 0, 0); + warppointer(display, grab_window, 0, 0); XCALL; - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); if (!XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("No pointer event was received"); @@ -446,13 +446,13 @@ XEvent ev; grab_window = defwin(display); event_mask = PointerMotionMask; pointer_mode = GrabModeAsync; - (void) warppointer(display, grab_window, 0, 0); + warppointer(display, grab_window, 0, 0); /* * Freeze the pointer by grabbing the keyboard. */ XGrabKeyboard(display, grab_window, False, GrabModeSync, GrabModeAsync, thetime); - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); if (XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("Pointer event was received while frozen"); return; @@ -489,11 +489,11 @@ XEvent ev; grab_window = defwin(display); event_mask = PointerMotionMask; pointer_mode = GrabModeSync; - (void) warppointer(display, grab_window, 0, 0); + warppointer(display, grab_window, 0, 0); XCALL; - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); if (XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("Pointer event was received while frozen"); return; @@ -519,12 +519,12 @@ XEvent ev; grab_window = defwin(display); event_mask = PointerMotionMask; pointer_mode = GrabModeSync; - (void) warppointer(display, grab_window, 0, 0); + warppointer(display, grab_window, 0, 0); XSelectInput(display, grab_window, PointerMotionMask); XCALL; - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); if (XCheckMaskEvent(display, (long)event_mask, &ev)) { delete("Pointer event was received while frozen"); return; @@ -574,7 +574,7 @@ static int key; /* * Try to provoke a keypress on grab_window. */ - (void) warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 1); keypress(display, key); if (XCheckMaskEvent(display, KeyPressMask, &ev)) res = False; @@ -675,7 +675,7 @@ XEvent ev; keyboard_mode = GrabModeSync; XCALL; - (void) warppointer(display, grab_window, 10, 10); + warppointer(display, grab_window, 10, 10); keypress(display, key); keyrel(display, key); @@ -697,7 +697,7 @@ XEvent ev; FAIL; } else { first = ev.type; - (void) getevent(display, &ev); + getevent(display, &ev); if (ev.type != KeyPress && first != KeyPress) { report("Did not get KeyPress event after releasing grab"); @@ -907,7 +907,7 @@ Warp pointer outside confine_to window. Verify that pointer is still within the confine_to window. >>CODE - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); grab_window = defwin(display); confine_to = defwin(display); @@ -921,7 +921,7 @@ Verify that pointer is still within the confine_to window. CHECK; /* It is known that no window gets created at (0,0) */ - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); if (getpointerwin(display, DRW(display)) != confine_to) { report("Pointer moved out of confine_to window after warp"); @@ -952,13 +952,13 @@ XCrossingEvent *cp; XEnterWindowEvent entergood; XLeaveWindowEvent leavegood; - (void) warppointer(Dsp, DRW(Dsp), 0, 0); + warppointer(Dsp, DRW(Dsp), 0, 0); grab_window = defwin(display); confine_to = defwin(display); win = defwin(display); - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSelectInput(display, win, EnterWindowMask|LeaveWindowMask); XSelectInput(display, grab_window, EnterWindowMask|LeaveWindowMask); @@ -1090,7 +1090,7 @@ Verify that pointer has been warped to the new position. >>CODE struct area area; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); grab_window = defwin(display); @@ -1144,7 +1144,7 @@ Bool s; return; } - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); grab_window = defwin(display); confine_to = defdraw(display, VI_ALT_WIN); @@ -1209,8 +1209,8 @@ XEvent ev; /* * Ensure that pointer either enters or moves within win. */ - (void) warppointer(display, win, 1, 1); - (void) warppointer(display, win, 1, 2); + warppointer(display, win, 1, 1); + warppointer(display, win, 1, 2); XSync(client2, False); if (getevent(client2, &ev)) { @@ -1363,7 +1363,7 @@ Display *client2; Window win; XEvent ev; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); client2 = opendisplay(); @@ -1383,7 +1383,7 @@ XEvent ev; * If the grab has been released then this will generate * an event for client2. */ - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (XCheckWindowEvent(client2, win, PointerMotionMask|EnterWindowMask, &ev)) @@ -1404,7 +1404,7 @@ XEvent ev; XUnmapWindow(display, confine_to); /* Warp to win and check for events on client2 */ - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (XCheckWindowEvent(client2, win, PointerMotionMask|EnterWindowMask, &ev)) @@ -1435,7 +1435,7 @@ Display *client2; Window win; XEvent ev; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); client2 = opendisplay(); @@ -1449,7 +1449,7 @@ XEvent ev; XCALL; XMoveWindow(display, confine_to, -9000, -9000); - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSync(client2, False); if (isdeleted()) @@ -1497,7 +1497,7 @@ Verify that xname fails and returns GrabNotViewable. >>CODE int ret; - (void) warppointer(Dsp, DRW(Dsp), 0, 0); + warppointer(Dsp, DRW(Dsp), 0, 0); grab_window = defwin(display); confine_to = defwin(display); @@ -1524,7 +1524,7 @@ Verify that xname fails and returns GrabNotViewable. >>CODE int ret; - (void) warppointer(Dsp, DRW(Dsp), 0, 0); + warppointer(Dsp, DRW(Dsp), 0, 0); grab_window = defwin(display); confine_to = defwin(display); diff --git a/xts5/Xlib13/XSetInputFocus.m b/xts5/Xlib13/XSetInputFocus.m index a58d35f3..85f20e49 100644 --- a/xts5/Xlib13/XSetInputFocus.m +++ b/xts5/Xlib13/XSetInputFocus.m @@ -175,7 +175,7 @@ long mask; XSelectInput(display, win, mask = KeyPressMask|KeyReleaseMask); focus = None; XCALL; - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 2, 2); XSync(display, True); /* clear out event queue */ keypress(display, getkeycode(display)); if (n=getevent(display, &ev)) /* assignment intentional */ { @@ -338,7 +338,7 @@ long mask; trace("Test with toplevel window and PointerRoot."); focus = PointerRoot; XCALL; - (void) warppointer(display, win, 2, 2); + warppointer(display, win, 2, 2); XSync(display, True); /* clear out event queue */ keypress(display, keycode=getkeycode(display)); if (!getevent(display, &ev)) { @@ -354,7 +354,7 @@ long mask; } else CHECK; trace("Test with root and PointerRoot."); - (void) warppointer(display, root, 0,0); + warppointer(display, root, 0,0); XSync(display, True); /* clear out event queue */ relalldev(); if (!getevent(display, &ev)) { @@ -375,7 +375,7 @@ long mask; trace("Testing with root of alternate screen as source (0x%x) and PointerRoot.", (unsigned)altroot); XSelectInput(display, altroot, mask); - (void) warppointer(display, altroot, 0,0); + warppointer(display, altroot, 0,0); XSync(display, True); /* clear out event queue */ keypress(display, keycode); relalldev(); @@ -545,7 +545,7 @@ int newrevert; focus = crechild(display, base, (struct area *)0); revert_to = RevertToPointerRoot; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); if (isdeleted()) return; @@ -693,7 +693,7 @@ int newrevert; focus = crechild(display, base, (struct area *)0); revert_to = RevertToNone; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); if (isdeleted()) return; @@ -924,7 +924,7 @@ int junk; } else CHECK; - (void) sleep(1); /* make sure the current time is != t1 */ + sleep(1); /* make sure the current time is != t1 */ thetime = CurrentTime; focus = win; diff --git a/xts5/Xlib13/XSetPointerMapping.m b/xts5/Xlib13/XSetPointerMapping.m index 0c0f70c1..5b29e597 100644 --- a/xts5/Xlib13/XSetPointerMapping.m +++ b/xts5/Xlib13/XSetPointerMapping.m @@ -150,7 +150,7 @@ static void restoremap() { if(Dsp) - (void) XSetPointerMapping(Dsp, oldmap, numbuttons); + XSetPointerMapping(Dsp, oldmap, numbuttons); cleanup(); } @@ -184,7 +184,7 @@ int i; XCALL; - (void) XGetPointerMapping(display, newmap, MAPSIZE); + XGetPointerMapping(display, newmap, MAPSIZE); if (isdeleted()) { delete("Could not get pointer mapping"); return; @@ -269,7 +269,7 @@ Window win; for(i=0; i<numbuttons; i++) zmap[i] = map[i]; win = defwin(display); - (void) warppointer(display, win, 2,2); + warppointer(display, win, 2,2); XSelectInput(display, win, ButtonPressMask); for(i=0; i<numbuttons; i++) { diff --git a/xts5/Xlib13/XUngrabButton.m b/xts5/Xlib13/XUngrabButton.m index 60c9d3d6..f515f9f0 100644 --- a/xts5/Xlib13/XUngrabButton.m +++ b/xts5/Xlib13/XUngrabButton.m @@ -128,8 +128,8 @@ XEvent ev; /* * Ensure that pointer either enters or moves within grab_window. */ - (void) warppointer(display, grab_window, 1, 1); - (void) warppointer(display, grab_window, 1, 2); + warppointer(display, grab_window, 1, 1); + warppointer(display, grab_window, 1, 2); XSync(client2, False); if (getevent(client2, &ev)) { @@ -158,7 +158,7 @@ XEvent ev; static activate() { - (void) warppointer(display, grab_window, ACTPOSX, ACTPOSY); + warppointer(display, grab_window, ACTPOSX, ACTPOSY); if (modifiers) modpress(display, modifiers); buttonpress(display, button); diff --git a/xts5/Xlib13/XUngrabKeyboard.m b/xts5/Xlib13/XUngrabKeyboard.m index 93c7f51a..61bc244d 100644 --- a/xts5/Xlib13/XUngrabKeyboard.m +++ b/xts5/Xlib13/XUngrabKeyboard.m @@ -136,7 +136,7 @@ XEvent ev; CHECK; key = getkeycode(display); - (void) warppointer(display, win, 10, 10); + warppointer(display, win, 10, 10); keypress(display, key); keyrel(display, key); @@ -155,7 +155,7 @@ XEvent ev; FAIL; } else { first = ev.type; - (void) getevent(display, &ev); + getevent(display, &ev); if (ev.type != KeyPress && first != KeyPress) { report("Did not get KeyPress event after releasing grab"); @@ -171,7 +171,7 @@ XEvent ev; win = defwin(display); XSelectInput(display, win, KeyPressMask); - (void) warppointer(display, win, 5, 5); + warppointer(display, win, 5, 5); keypress(display, key); if (XCheckWindowEvent(display, win, KeyPressMask, &ev)) CHECK; @@ -208,8 +208,8 @@ XEvent ev; win = defwin(display); XSelectInput(display, win, PointerMotionMask); - (void) warppointer(display, win, 0, 0); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 0, 0); + warppointer(display, win, 1, 1); if (XCheckWindowEvent(display, win, PointerMotionMask, &ev)) return(False); diff --git a/xts5/Xlib13/XUngrabPointer.m b/xts5/Xlib13/XUngrabPointer.m index 9e4f9606..fa7e96ae 100644 --- a/xts5/Xlib13/XUngrabPointer.m +++ b/xts5/Xlib13/XUngrabPointer.m @@ -124,12 +124,12 @@ unsigned int mask = PointerMotionMask; win = defwin(display); XSelectInput(display, win, PointerMotionMask); - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XGrabPointer(display, win, False, mask, GrabModeSync, GrabModeAsync, None, None, CurrentTime); - (void) warppointer(display, win, 1, 1); + warppointer(display, win, 1, 1); if (XCheckMaskEvent(display, (unsigned long)mask, &ev)) { delete("Pointer event was received while frozen"); return; @@ -177,7 +177,7 @@ unsigned int mask; client2 = opendisplay(); win = defwin(display); - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XSelectInput(client2, win, (unsigned long)mask); grabwin = defwin(display); @@ -193,7 +193,7 @@ unsigned int mask; thetime -= 100; XCALL; - (void) warppointer(display, win, 8, 8); + warppointer(display, win, 8, 8); if (XCheckMaskEvent(client2, (unsigned long)mask, &ev)) { report("Grab was released when time was earlier than last-pointer-grab time"); FAIL; @@ -211,7 +211,7 @@ unsigned int mask; XCALL; - (void) warppointer(display, win, 12, 1); + warppointer(display, win, 12, 1); if (XCheckMaskEvent(client2, (unsigned long)mask, &ev)) { report("Grab was released when time was earlier than last-pointer-grab time"); FAIL; @@ -245,7 +245,7 @@ XLeaveWindowEvent leavegood; grabwin = defwin(display); win = defwin(display); - (void) warppointer(display, win, 0, 0); + warppointer(display, win, 0, 0); XGrabPointer(display, grabwin, False, (unsigned int)PointerMotionMask, GrabModeSync, GrabModeAsync, None, None, CurrentTime); diff --git a/xts5/Xlib13/XWarpPointer.m b/xts5/Xlib13/XWarpPointer.m index 69b4691f..b05450aa 100644 --- a/xts5/Xlib13/XWarpPointer.m +++ b/xts5/Xlib13/XWarpPointer.m @@ -176,7 +176,7 @@ Verify that new position is offset from old by dest_x, dest_y. struct coord old; struct coord new; - (void) warppointer(display, DRW(display), 100, 100); + warppointer(display, DRW(display), 100, 100); dest_w = None; src_w = None; @@ -229,7 +229,7 @@ Verify that pointer is at (dest_x,dest_y) from origin of dest_w. >>CODE struct coord pos; - (void) warppointer(display, DRW(display), 0, 0); + warppointer(display, DRW(display), 0, 0); dest_w = defwin(display); src_w = None; @@ -274,7 +274,7 @@ struct coord pos; dest_w = defwin(display); src_w = defwin(display); - (void) warppointer(display, src_w, src_x, src_y); + warppointer(display, src_w, src_x, src_y); XCALL; @@ -347,7 +347,7 @@ struct coord pos; getsize(display, src_w, &width, &height); - (void) warppointer(display, src_w, src_x+3, (int)height-3); + warppointer(display, src_w, src_x+3, (int)height-3); XCALL; @@ -388,7 +388,7 @@ struct coord pos; getsize(display, src_w, &width, &height); - (void) warppointer(display, src_w, (int)width-3, src_y+3); + warppointer(display, src_w, (int)width-3, src_y+3); XCALL; @@ -422,7 +422,7 @@ int n; dest_w = defwin(display); src_w = None; - (void) warppointer(display, dest_w, 0, 0); + warppointer(display, dest_w, 0, 0); XSelectInput(display, dest_w, PointerMotionMask); @@ -482,7 +482,7 @@ unsigned int width, height; getsize(display, confine, &width, &height); /* May as well put the pointer there to begin with */ - (void) warppointer(display, confine, 1, 1); + warppointer(display, confine, 1, 1); XGrabPointer(display, grabwin, False, 0, GrabModeAsync, GrabModeAsync, confine, None, CurrentTime); diff --git a/xts5/Xlib14/XmbSetWMProperties.m b/xts5/Xlib14/XmbSetWMProperties.m index facfaead..96735f91 100644 --- a/xts5/Xlib14/XmbSetWMProperties.m +++ b/xts5/Xlib14/XmbSetWMProperties.m @@ -315,7 +315,7 @@ static unsigned long leftover; * in the service invocation */ - (void) XGetWMNormalHints(display, window_id, &hints_return, &supplied); + XGetWMNormalHints(display, window_id, &hints_return, &supplied); check_dec((long)hints->flags, (long)hints_return.flags , "XSizeHints->flags"); check_dec((long)hints->x, (long)hints_return.x , "XSizeHints->x"); diff --git a/xts5/Xlib16/XrmGetFileDatabase.m b/xts5/Xlib16/XrmGetFileDatabase.m index d5944225..9b6a60af 100644 --- a/xts5/Xlib16/XrmGetFileDatabase.m +++ b/xts5/Xlib16/XrmGetFileDatabase.m @@ -184,7 +184,7 @@ XrmDatabase rdb; CHECK; } *tptr = '\0'; - (void) fprintf(f, "%s\n", tbuf); + fprintf(f, "%s\n", tbuf); } fclose(f); @@ -213,7 +213,7 @@ XrmDatabase rdb; /* Remove test database file. */ #ifndef TESTING - (void) unlink(XGFD_TEST_FILE); /* Compiling with CFLOCAL=-DTESTING */ + unlink(XGFD_TEST_FILE); /* Compiling with CFLOCAL=-DTESTING */ /* allows inspection of the testfile */ #endif @@ -273,7 +273,7 @@ XrmDatabase rdb; CHECK; } *tptr = '\0'; - (void) fprintf(f, "%s\n", tbuf); + fprintf(f, "%s\n", tbuf); } fclose(f); diff --git a/xts5/Xlib16/XrmGetResource.m b/xts5/Xlib16/XrmGetResource.m index 9f5d81a1..a28e1cee 100644 --- a/xts5/Xlib16/XrmGetResource.m +++ b/xts5/Xlib16/XrmGetResource.m @@ -197,7 +197,7 @@ Bool ret; strcpy(tb, "<NULL POINTER>"); l = strlen(tb); } else { - (void) strncpy(tb, (char*)value.addr, value.size); + strncpy(tb, (char*)value.addr, value.size); tb[value.size]='\0'; l = value.size; } @@ -275,7 +275,7 @@ Bool ret; strcpy(tb, "<NULL POINTER>"); l = strlen(tb); } else { - (void) strncpy(tb, (char*)value.addr, value.size); + strncpy(tb, (char*)value.addr, value.size); tb[value.size]='\0'; l = value.size; } diff --git a/xts5/Xlib16/XrmQGetResource.m b/xts5/Xlib16/XrmQGetResource.m index df610a27..2c38b61c 100644 --- a/xts5/Xlib16/XrmQGetResource.m +++ b/xts5/Xlib16/XrmQGetResource.m @@ -198,7 +198,7 @@ Bool ret; strcpy(tb, "<NULL POINTER>"); l = strlen(tb); } else { - (void) strncpy(tb, (char*)value.addr, value.size); + strncpy(tb, (char*)value.addr, value.size); tb[value.size]='\0'; l = value.size; } @@ -277,7 +277,7 @@ Bool ret; strcpy(tb, "<NULL POINTER>"); l = strlen(tb); } else { - (void) strncpy(tb, (char*)value.addr, value.size); + strncpy(tb, (char*)value.addr, value.size); tb[value.size]='\0'; l = value.size; } diff --git a/xts5/Xlib16/XrmStringToBindingQuarkList.m b/xts5/Xlib16/XrmStringToBindingQuarkList.m index 1f5e4897..d64daf52 100644 --- a/xts5/Xlib16/XrmStringToBindingQuarkList.m +++ b/xts5/Xlib16/XrmStringToBindingQuarkList.m @@ -238,8 +238,8 @@ char *buffer2; /* Create the test string. */ for(t=0; t<xstbql_ns1; t++) { - (void) strcat(buffer1, xstbql_s1prefix[t]); - (void) strcat(buffer1, xstbql_s1[t]); + strcat(buffer1, xstbql_s1prefix[t]); + strcat(buffer1, xstbql_s1[t]); } trace("Testing with '%s'", buffer1); @@ -275,9 +275,9 @@ char *buffer2; trace("Quark array[%d]=%d. Represents: '%s' as expected.", t, xstbql_qret[t], ts ); } - (void) strcat(buffer2, ts); + strcat(buffer2, ts); } - (void) strcat(buffer2, " "); + strcat(buffer2, " "); } if (fail) { @@ -326,8 +326,8 @@ char *buffer2; /* Create the test string. */ for(t=0; t<xstbql_ns2; t++) { - (void) strcat(buffer1, xstbql_s2[t]); - (void) strcat(buffer1, xstbql_s2sep[t]); + strcat(buffer1, xstbql_s2[t]); + strcat(buffer1, xstbql_s2sep[t]); } trace("Testing with '%s'", buffer1); @@ -363,9 +363,9 @@ char *buffer2; trace("Quark array[%d]=%d. Represents: '%s' as expected.", t, xstbql_qret[t], ts ); } - (void) strcat(buffer2, ts); + strcat(buffer2, ts); } - (void) strcat(buffer2, " "); + strcat(buffer2, " "); } if (fail) { @@ -457,8 +457,8 @@ char *buffer2, *buffer3; /* Create the test string. */ for(t=0; t<xstbql_ns4; t++) { - (void) strcat(buffer1, xstbql_s4prefix[t]); - (void) strcat(buffer1, xstbql_s4[t]); + strcat(buffer1, xstbql_s4prefix[t]); + strcat(buffer1, xstbql_s4[t]); } trace("Testing with '%s'", buffer1); @@ -492,11 +492,11 @@ char *buffer2, *buffer3; t, retstr); } - (void) strcat(buffer2, expstr); - (void) strcat(buffer2, " "); + strcat(buffer2, expstr); + strcat(buffer2, " "); - (void) strcat(buffer3, retstr); - (void) strcat(buffer3, " "); + strcat(buffer3, retstr); + strcat(buffer3, " "); } if (fail) { @@ -538,7 +538,7 @@ int t; /* Create the test string. */ for(t=0; t<xstbql_ns5; t++) { - (void) strcat(buffer1, xstbql_s5[t]); + strcat(buffer1, xstbql_s5[t]); } trace("Testing with '%s'", buffer1); diff --git a/xts5/Xlib16/XrmStringToQuarkList.m b/xts5/Xlib16/XrmStringToQuarkList.m index 4bad02df..b3f8a522 100644 --- a/xts5/Xlib16/XrmStringToQuarkList.m +++ b/xts5/Xlib16/XrmStringToQuarkList.m @@ -192,8 +192,8 @@ char *buffer2; /* Create the test string. */ for(t=0; t<xstql_ns1; t++) { - (void) strcat(buffer1, xstql_s1[t]); - (void) strcat(buffer1, xstql_s1sep[t]); + strcat(buffer1, xstql_s1[t]); + strcat(buffer1, xstql_s1sep[t]); } trace("Testing with '%s'", buffer1); @@ -229,9 +229,9 @@ char *buffer2; trace("Quark array[%d]=%d. Represents: '%s' as expected.", t, xstql_ret[t], ts ); } - (void) strcat(buffer2, ts); + strcat(buffer2, ts); } - (void) strcat(buffer2, " "); + strcat(buffer2, " "); } if (fail) { @@ -279,8 +279,8 @@ char *buffer2; /* Create the test string. */ for(t=0; t<xstql_ns2; t++) { - (void) strcat(buffer1, xstql_s2[t]); - (void) strcat(buffer1, xstql_s2sep[t]); + strcat(buffer1, xstql_s2[t]); + strcat(buffer1, xstql_s2sep[t]); } trace("Testing with '%s'", buffer1); @@ -316,9 +316,9 @@ char *buffer2; trace("Quark array[%d]=%d. Represents: '%s' as expected.", t, xstql_ret[t], ts ); } - (void) strcat(buffer2, ts); + strcat(buffer2, ts); } - (void) strcat(buffer2, " "); + strcat(buffer2, " "); } if (fail) { @@ -358,7 +358,7 @@ int t; /* Create the test string. */ for(t=0; t<xstql_ns3; t++) { - (void) strcat(buffer1, xstql_s3[t]); + strcat(buffer1, xstql_s3[t]); } trace("Testing with '%s'", buffer1); diff --git a/xts5/Xlib17/XReadBitmapFile.m b/xts5/Xlib17/XReadBitmapFile.m index a25ff795..ab20cd3f 100644 --- a/xts5/Xlib17/XReadBitmapFile.m +++ b/xts5/Xlib17/XReadBitmapFile.m @@ -181,7 +181,7 @@ int elements; a = 0; while( a<elements ) { - (void) fprintf(fp, "%s\n", data[a++]); + fprintf(fp, "%s\n", data[a++]); } fclose(fp); @@ -191,13 +191,13 @@ int elements; static void xrbf_b_start() { tpstartup(); - (void) xrbf_create(xrbf_name, xrbf_one, xrbf_n_one); + xrbf_create(xrbf_name, xrbf_one, xrbf_n_one); } static void xrbf_b_end() { - (void) unlink(xrbf_name); + unlink(xrbf_name); tpcleanup(); } @@ -248,7 +248,7 @@ Verify that BitmapSuccess was returned. /* Call xname to read the bitmap file. */ XCALL; - (void) unlink(filename); + unlink(filename); CHECKPASS(1); >>ASSERTION Good A @@ -346,7 +346,7 @@ unsigned int h_ret, w_ret, d_ret, ui_tmp; } else CHECK; - (void) unlink(filename); + unlink(filename); CHECKPASS(6); @@ -403,7 +403,7 @@ Verify that the y_hot_return was returned as expected. } else CHECK; - (void) unlink(filename); + unlink(filename); CHECKPASS(3); @@ -456,7 +456,7 @@ Verify that the y_hot_return was returned as expected. } else CHECK; - (void) unlink(filename); + unlink(filename); CHECKPASS(3); >>ASSERTION Bad A @@ -520,7 +520,7 @@ int ret; } else CHECK; - (void) unlink(filename); + unlink(filename); CHECKPASS(2); diff --git a/xts5/Xlib17/XWriteBitmapFile.m b/xts5/Xlib17/XWriteBitmapFile.m index 625625a2..63cbf766 100644 --- a/xts5/Xlib17/XWriteBitmapFile.m +++ b/xts5/Xlib17/XWriteBitmapFile.m @@ -339,8 +339,8 @@ int ret; CHECKPASS(2); - (void) unlink(XWBF_FILE); - (void) rmdir(XWBF_DIR); + unlink(XWBF_FILE); + rmdir(XWBF_DIR); >>ASSERTION Bad B 1 When insufficient memory is allocated, then a call to xname returns diff --git a/xts5/Xlib3/XCloseDisplay.m b/xts5/Xlib3/XCloseDisplay.m index 4b30ac94..355c3448 100644 --- a/xts5/Xlib3/XCloseDisplay.m +++ b/xts5/Xlib3/XCloseDisplay.m @@ -801,7 +801,7 @@ XWindowAttributes atts, batts; oldx = bt[0][0].x + bt[0][0].borderwidth + cli1btp->x + cli1btp->borderwidth + btp->x; oldy = bt[0][0].y + bt[0][0].borderwidth + cli1btp->y + cli1btp->borderwidth + btp->y; - (void) XGetWindowAttributes(Dsp, btp->wid, &atts); + XGetWindowAttributes(Dsp, btp->wid, &atts); newx = batts.x + batts.border_width + atts.x; newy = batts.y + batts.border_width + atts.y; @@ -1267,7 +1267,7 @@ int i; display = Dsp; XSetCloseDownMode(display, DestroyAll); - (void) XInternAtom(display, atname, False); + XInternAtom(display, atname, False); PROTECT(XCloseDisplay(display)); /* @@ -1693,7 +1693,7 @@ XWindowAttributes atts; oldx = btp->x; oldy = btp->y; - (void) XGetWindowAttributes(Dsp, btp->wid, &atts); + XGetWindowAttributes(Dsp, btp->wid, &atts); newx = atts.x; newy = atts.y; @@ -1879,7 +1879,7 @@ char *name; for(k=0; k<2; k++) { XSetCloseDownMode(Dsp, closemodes[k]); - (void) XInternAtom(Dsp, atname, False); + XInternAtom(Dsp, atname, False); PROTECT(XCloseDisplay(Dsp)); /* diff --git a/xts5/Xlib3/XDisplayString/XDisplayString.m b/xts5/Xlib3/XDisplayString/XDisplayString.m index 8d05a7d9..dd586821 100644 --- a/xts5/Xlib3/XDisplayString/XDisplayString.m +++ b/xts5/Xlib3/XDisplayString/XDisplayString.m @@ -181,7 +181,7 @@ In child : if(config.posix_system == 0) { unsupported("This assertion can only be tested on a POSIX system."); } else - (void) tet_fork(t002exec, TET_NULLFP, 0, 0xFF); + tet_fork(t002exec, TET_NULLFP, 0, 0xFF); >>EXTERN extern char **environ; @@ -214,7 +214,7 @@ char *mstr = "DISPLAY=%s"; return; } - (void) tet_exec("./Test1", argv, environ); + tet_exec("./Test1", argv, environ); delete("Exec of file ./Test1 failed"); free( (char *) str); diff --git a/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m index 64ec7ba8..e5822a83 100644 --- a/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m +++ b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m @@ -648,7 +648,7 @@ In child: if(config.posix_system == 0) { unsupported("This assertion can only be tested on a POSIX system."); } else - (void) tet_fork(t005exec, TET_NULLFP, 0 , ~0); + tet_fork(t005exec, TET_NULLFP, 0 , ~0); >>EXTERN extern char **environ; @@ -675,7 +675,7 @@ char *mstr = "DISPLAY=%s"; return; } - (void) tet_exec("./Test1", argv, environ); + tet_exec("./Test1", argv, environ); delete("Exec of file ./Test1 failed"); free( (char *) str); diff --git a/xts5/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m b/xts5/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m index e42ed0a3..c1e09f87 100644 --- a/xts5/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m +++ b/xts5/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m @@ -851,7 +851,7 @@ Bool samedefcursor; return; if(config.alt_screen != -1) { - (void) warppointer(display, DRW(display), 0,0); + warppointer(display, DRW(display), 0,0); altroot = RootWindow(display, config.alt_screen); samedefcursor = spriteiswin(display, altroot); } @@ -872,7 +872,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer into the root window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the root window. */ if(spriteiswin(display, w) == False) { @@ -882,7 +882,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer to the alternate root window. */ - (void) warppointer(display, altroot, 0,0); + warppointer(display, altroot, 0,0); /* Verify that the current cursor is not the same as that of the default root window. */ if(spriteiswin(display, DRW(display)) != False) { @@ -921,7 +921,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer to the root window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the root window. */ if(spriteiswin(display, w) == False) { diff --git a/xts5/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m b/xts5/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m index 284c35f4..809394a0 100644 --- a/xts5/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m +++ b/xts5/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m @@ -145,7 +145,7 @@ Window parent; /* Create a window hierarchy using buildtree. */ parent = defwin(display); - (void) buildtree(display, parent, SimpleTemplate, NSimpleTemplate); + buildtree(display, parent, SimpleTemplate, NSimpleTemplate); /* Call xname with direction of RaiseLowest upon parent. */ w = parent; @@ -174,7 +174,7 @@ Window parent; /* Create a window hierarchy using buildtree. */ parent = defwin(display); - (void) buildtree(display, parent, SimpleTemplate, NSimpleTemplate); + buildtree(display, parent, SimpleTemplate, NSimpleTemplate); /* Call xname with direction of LowerHighest upon parent. */ w = parent; @@ -209,7 +209,7 @@ Window parent, zero; /* Call setforexpose on window 'zero' to allow Expose event checking. */ setforexpose(display, zero); - (void) buildtree(display, parent, Expose2Template, NExpose2Template); + buildtree(display, parent, Expose2Template, NExpose2Template); /* Select Expose events on window 'zero'. */ XSelectInput(display, zero, ExposureMask); diff --git a/xts5/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m b/xts5/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m index 17797fc4..024c93d0 100644 --- a/xts5/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m +++ b/xts5/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m @@ -100,7 +100,7 @@ Window parent; /* Create a window hierarchy using buildtree. */ parent = defwin(display); - (void) buildtree(display, parent, SimpleTemplate, NSimpleTemplate); + buildtree(display, parent, SimpleTemplate, NSimpleTemplate); /* Call xname upon the parent window. */ w = parent; @@ -134,7 +134,7 @@ Window parent, one; /* Call setforexpose on window 'one' to allow Expose event checking. */ setforexpose(display, one); - (void) buildtree(display, parent, Expose2Template, NExpose2Template); + buildtree(display, parent, Expose2Template, NExpose2Template); /* Select Expose events on window 'one'. */ XSelectInput(display, one, ExposureMask); diff --git a/xts5/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m b/xts5/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m index b3959d1b..ce9107aa 100644 --- a/xts5/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m +++ b/xts5/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m @@ -140,7 +140,7 @@ Window parent; /* Create a window hierarchy using buildtree. */ parent = defwin(display); - (void) buildtree(display, parent, SimpleTemplate, NSimpleTemplate); + buildtree(display, parent, SimpleTemplate, NSimpleTemplate); /* Call xname upon the parent. */ w = parent; @@ -173,7 +173,7 @@ Window parent, zero; /* Call setforexpose on window 'zero' to allow Expose event checking. */ setforexpose(display, zero); - (void) buildtree(display, parent, Expose2Template, NExpose2Template); + buildtree(display, parent, Expose2Template, NExpose2Template); /* Select Expose events on window 'zero'. */ XSelectInput(display, zero, ExposureMask); diff --git a/xts5/Xlib4/XConfigureWindow/XConfigureWindow.m b/xts5/Xlib4/XConfigureWindow/XConfigureWindow.m index 5fe4dd0a..de380a8d 100644 --- a/xts5/Xlib4/XConfigureWindow/XConfigureWindow.m +++ b/xts5/Xlib4/XConfigureWindow/XConfigureWindow.m @@ -450,7 +450,7 @@ int pass = 0, fail = 0; gravgood.window = gnp->window; gravgood.x = btp->x; gravgood.y = btp->y; - (void) calcxy(top, evtype, &gravgood.x, &gravgood.y); + calcxy(top, evtype, &gravgood.x, &gravgood.y); if (checkevent((XEvent*)&gravgood, &ev) == 0) CHECK; @@ -1865,7 +1865,7 @@ XConfigureEvent good; XEvent ev; int n; - (void) onewin(); + onewin(); XSelectInput(display, w, StructureNotifyMask); @@ -1931,7 +1931,7 @@ Resize window with xname. Verify that correct expose events were received with exposecheck(). >>CODE - (void) onewin(); + onewin(); XSetWindowBackground(display, w, W_BG); XClearWindow(display, w); @@ -2015,7 +2015,7 @@ Verify that window contents are unchanged. >>CODE XImage *imp; - (void) onewin(); + onewin(); pattern(display, w); @@ -2126,7 +2126,7 @@ Call xname. Verify BadValue error. >>CODE BadValue - (void) onewin(); + onewin(); values->width = 0; values->height = 0; diff --git a/xts5/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m b/xts5/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m index 69f8074b..ce158291 100644 --- a/xts5/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m +++ b/xts5/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m @@ -530,7 +530,7 @@ Cursor pcur; XMapWindow(display, w); /* Warp the pointer to the child window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the parent. */ if(spriteiswin(display, parent) == False) { diff --git a/xts5/Xlib4/XCreateWindow/XCreateWindow.m b/xts5/Xlib4/XCreateWindow/XCreateWindow.m index c64920d8..14ac775e 100644 --- a/xts5/Xlib4/XCreateWindow/XCreateWindow.m +++ b/xts5/Xlib4/XCreateWindow/XCreateWindow.m @@ -790,7 +790,7 @@ int supported; class = InputOutput; - (void) XCALL; + XCALL; if (geterr() == BadMatch) PASS; @@ -817,7 +817,7 @@ Verify that a BadMatch error occurs. parent = iponlywin(display); class = InputOutput; - (void) XCALL; + XCALL; if (geterr() == BadMatch) PASS; @@ -845,7 +845,7 @@ Verify that BadMatch error occurs. depth = 1; border_width = 0; - (void) XCALL; + XCALL; if (geterr() == BadMatch) PASS; @@ -877,7 +877,7 @@ Verify that a BadValue error occurs. width = 0; height = 10; - (void) XCALL; + XCALL; if (geterr() == BadValue) CHECK; @@ -887,7 +887,7 @@ Verify that a BadValue error occurs. width = 10; height = 0; - (void) XCALL; + XCALL; if (geterr() == BadValue) CHECK; diff --git a/xts5/Xlib4/XDefineCursor.m b/xts5/Xlib4/XDefineCursor.m index 09753ad7..ba77e99d 100644 --- a/xts5/Xlib4/XDefineCursor.m +++ b/xts5/Xlib4/XDefineCursor.m @@ -197,7 +197,7 @@ Bool samedefcursor; if(noext(0) == False) { if(config.alt_screen != -1) { - (void) warppointer(display, DRW(display), 0,0); + warppointer(display, DRW(display), 0,0); altroot = RootWindow(display, config.alt_screen); samedefcursor = spriteiswin(display, altroot); } @@ -218,7 +218,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer into the root window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the root window. */ if(spriteiswin(display, w) == False) { @@ -228,7 +228,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer to the alternate root window. */ - (void) warppointer(display, altroot, 0,0); + warppointer(display, altroot, 0,0); /* Verify that the current cursor is not the same as that of the default root window. */ if(spriteiswin(display, DRW(display)) != False) { @@ -267,7 +267,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer to the root window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the root window. */ if(spriteiswin(display, w) == False) { @@ -360,7 +360,7 @@ struct area ar; CHECK; /* Warp the pointer into the parent. */ - (void) warppointer(display, parent, 0,0); + warppointer(display, parent, 0,0); /* Verify that the current cursor is that of the parent. */ if(spriteiswin(display, parent) == False) { @@ -388,7 +388,7 @@ struct area ar; CHECK; /* Warp the pointer into the child. */ - (void) warppointer(display, w , 0,0); + warppointer(display, w , 0,0); /* Verify that the current cursor is not that of the parent. */ if(spriteiswin(display, parent) != False) { @@ -475,7 +475,7 @@ XVisualInfo *vp; CHECK; /* Warp the pointer into the window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the window. */ if(spriteiswin(display, w) == False) { diff --git a/xts5/Xlib4/XMapRaised/XMapRaised.m b/xts5/Xlib4/XMapRaised/XMapRaised.m index 938427ac..3826185f 100644 --- a/xts5/Xlib4/XMapRaised/XMapRaised.m +++ b/xts5/Xlib4/XMapRaised/XMapRaised.m @@ -148,7 +148,7 @@ XWindowAttributes atts; return; XCALL; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -196,7 +196,7 @@ XWindowAttributes atts; XCALL; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsUnviewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsUnviewable)); @@ -344,7 +344,7 @@ struct area area; } else CHECK; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsUnmapped) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsUnmapped)); @@ -600,7 +600,7 @@ int n; } else CHECK; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -772,7 +772,7 @@ int n; } else CHECK; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -1041,7 +1041,7 @@ XSetWindowAttributes setatts; CHECK; if (n == 1) { - (void) getevent(display, &ev); + getevent(display, &ev); if (ev.type != Expose) { /* Only Expose events were enabled */ delete("Unexpected event received (%s)", eventname(ev.type)); diff --git a/xts5/Xlib4/XMapSubwindows/XMapSubwindows.m b/xts5/Xlib4/XMapSubwindows/XMapSubwindows.m index e88e03d8..7f1e708a 100644 --- a/xts5/Xlib4/XMapSubwindows/XMapSubwindows.m +++ b/xts5/Xlib4/XMapSubwindows/XMapSubwindows.m @@ -140,7 +140,7 @@ int i; XCALL; for (i = 1; i < NELEM(T1); i++) { - (void) XGetWindowAttributes(display, btlist[i].wid, &atts); + XGetWindowAttributes(display, btlist[i].wid, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -182,7 +182,7 @@ int i; XCALL; for (i = 1; i < NELEM(T1); i++) { - (void) XGetWindowAttributes(display, btp[i].wid, &atts); + XGetWindowAttributes(display, btp[i].wid, &atts); if (atts.map_state != IsUnviewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsUnviewable)); @@ -242,7 +242,7 @@ int i; } for (i = 1; i < NELEM(T1); i++) { - (void) XGetWindowAttributes(display, bt[i].wid, &atts); + XGetWindowAttributes(display, bt[i].wid, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -351,7 +351,7 @@ int i; } else CHECK; - (void) XGetWindowAttributes(display, bt[i].wid, &atts); + XGetWindowAttributes(display, bt[i].wid, &atts); if (atts.map_state != IsUnmapped) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsUnmapped)); @@ -511,7 +511,7 @@ int i; report("No map notify received on parent of window '%s'", bt[i].name); FAIL; } - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -669,7 +669,7 @@ int i; report("No map notify received on parent of window '%s'", bt[i].name); FAIL; } - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -964,7 +964,7 @@ XSetWindowAttributes setatts; CHECK; if (n == 1) { - (void) getevent(display, &ev); + getevent(display, &ev); if (ev.type != Expose) { /* Only Expose events were enabled */ delete("Unexpected event received (%s)", eventname(ev.type)); diff --git a/xts5/Xlib4/XMapWindow/XMapWindow.m b/xts5/Xlib4/XMapWindow/XMapWindow.m index 0cc2dc16..07d236c4 100644 --- a/xts5/Xlib4/XMapWindow/XMapWindow.m +++ b/xts5/Xlib4/XMapWindow/XMapWindow.m @@ -134,7 +134,7 @@ struct area area; XCALL; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -175,7 +175,7 @@ XWindowAttributes atts; XCALL; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsUnviewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsUnviewable)); @@ -293,7 +293,7 @@ XImage *imp; FAIL; } - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -369,7 +369,7 @@ int n; else CHECK; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsUnmapped) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsUnmapped)); @@ -461,7 +461,7 @@ int n; else CHECK; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -554,7 +554,7 @@ int n; else CHECK; - (void) XGetWindowAttributes(display, w, &atts); + XGetWindowAttributes(display, w, &atts); if (atts.map_state != IsViewable) { report("map state after map was %s, expecting %s", mapstatename(atts.map_state), mapstatename(IsViewable)); @@ -819,7 +819,7 @@ XSetWindowAttributes setatts; CHECK; if (n == 1) { - (void) getevent(display, &ev); + getevent(display, &ev); if (ev.type != Expose) { /* Only Expose events were enabled */ delete("Unexpected event received (%s)", eventname(ev.type)); diff --git a/xts5/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m b/xts5/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m index 272236d1..7ae8243f 100644 --- a/xts5/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m +++ b/xts5/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m @@ -397,7 +397,7 @@ int pass = 0, fail = 0; gravgood.window = gnp->window; gravgood.x = btp->x; gravgood.y = btp->y; - (void) calcxy(top, evtype, &gravgood.x, &gravgood.y); + calcxy(top, evtype, &gravgood.x, &gravgood.y); if (checkevent((XEvent*)&gravgood, &ev) == 0) CHECK; diff --git a/xts5/Xlib4/XMoveWindow.m b/xts5/Xlib4/XMoveWindow.m index ebbf406e..3f64597e 100644 --- a/xts5/Xlib4/XMoveWindow.m +++ b/xts5/Xlib4/XMoveWindow.m @@ -201,7 +201,7 @@ Verify that window contents are unchanged. >>CODE XImage *imp; - (void) onewin(); + onewin(); pattern(display, w); @@ -384,7 +384,7 @@ XConfigureEvent good; XEvent ev; int n; - (void) onewin(); + onewin(); XSelectInput(display, w, StructureNotifyMask); diff --git a/xts5/Xlib4/XRaiseWindow/XRaiseWindow.m b/xts5/Xlib4/XRaiseWindow/XRaiseWindow.m index 6471f959..4e1407d6 100644 --- a/xts5/Xlib4/XRaiseWindow/XRaiseWindow.m +++ b/xts5/Xlib4/XRaiseWindow/XRaiseWindow.m @@ -173,7 +173,7 @@ Window parent, one; /* Call setforexpose on window 'one' to allow Expose event checking. */ setforexpose(display, one); - (void) buildtree(display, parent, Expose2Template, NExpose2Template); + buildtree(display, parent, Expose2Template, NExpose2Template); /* Select Expose events on window 'one'. */ XSelectInput(display, one, ExposureMask); diff --git a/xts5/Xlib4/XResizeWindow/XResizeWindow.m b/xts5/Xlib4/XResizeWindow/XResizeWindow.m index dd516018..d7309146 100644 --- a/xts5/Xlib4/XResizeWindow/XResizeWindow.m +++ b/xts5/Xlib4/XResizeWindow/XResizeWindow.m @@ -441,7 +441,7 @@ int pass = 0, fail = 0; gravgood.window = gnp->window; gravgood.x = btp->x; gravgood.y = btp->y; - (void) calcxy(top, evtype, &gravgood.x, &gravgood.y); + calcxy(top, evtype, &gravgood.x, &gravgood.y); if (checkevent((XEvent*)&gravgood, &ev) == 0) CHECK; @@ -1045,7 +1045,7 @@ XConfigureEvent good; XEvent ev; int n; - (void) onewin(); + onewin(); XSelectInput(display, w, StructureNotifyMask); @@ -1108,7 +1108,7 @@ Resize window with xname. Verify that correct expose events were received with exposecheck(). >>CODE - (void) onewin(); + onewin(); XSetWindowBackground(display, w, W_BG); XClearWindow(display, w); diff --git a/xts5/Xlib4/XUndefineCursor.m b/xts5/Xlib4/XUndefineCursor.m index 86c2ecd6..05c5f884 100644 --- a/xts5/Xlib4/XUndefineCursor.m +++ b/xts5/Xlib4/XUndefineCursor.m @@ -156,7 +156,7 @@ struct area ar; CHECK; /* Warp the pointer into the parent. */ - (void) warppointer(display, parent, 0,0); + warppointer(display, parent, 0,0); /* Verify that the current cursor is that of the parent. */ if(spriteiswin(display, parent) == False) { @@ -184,7 +184,7 @@ struct area ar; CHECK; /* Warp the pointer into the child. */ - (void) warppointer(display, w , 0,0); + warppointer(display, w , 0,0); /* Verify that the current cursor is not that of the parent. */ if(spriteiswin(display, parent) != False) { @@ -276,7 +276,7 @@ Bool samedefcursor; if(noext(0) == False) { if(config.alt_screen != -1) { - (void) warppointer(display, DRW(display), 0,0); + warppointer(display, DRW(display), 0,0); altroot = RootWindow(display, config.alt_screen); samedefcursor = spriteiswin(display, altroot); } @@ -297,7 +297,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer into the root window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the root window. */ if(spriteiswin(display, w) == False) { @@ -307,7 +307,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer to the alternate root window. */ - (void) warppointer(display, altroot, 0,0); + warppointer(display, altroot, 0,0); /* Verify that the current cursor is not the same as that of the default root window. */ if(spriteiswin(display, DRW(display)) != False) { @@ -345,7 +345,7 @@ Bool samedefcursor; CHECK; /* Warp the pointer to the root window. */ - (void) warppointer(display, w, 0,0); + warppointer(display, w, 0,0); /* Verify that the current cursor is that of the root window. */ if(spriteiswin(display, w) == False) { diff --git a/xts5/Xlib4/XUnmapSubwindows.m b/xts5/Xlib4/XUnmapSubwindows.m index 446ffca9..c289ac4f 100644 --- a/xts5/Xlib4/XUnmapSubwindows.m +++ b/xts5/Xlib4/XUnmapSubwindows.m @@ -390,7 +390,7 @@ Verify expose or backing store restore occurred with exposecheck(). >>CODE w = defwin(display); - (void) buildtree(display, w, T1, NT1); + buildtree(display, w, T1, NT1); setforexpose(display, w); XSelectInput(display, w, ExposureMask); diff --git a/xts5/Xlib4/XUnmapWindow.m b/xts5/Xlib4/XUnmapWindow.m index 7af38e5f..8d4efaa1 100644 --- a/xts5/Xlib4/XUnmapWindow.m +++ b/xts5/Xlib4/XUnmapWindow.m @@ -316,7 +316,7 @@ XWindowAttributes atts; setarea(&area, 5, 5, 10, 10); ch = crechild(display, w, &area); - (void) XGetWindowAttributes(display, ch, &atts); + XGetWindowAttributes(display, ch, &atts); if (atts.map_state != IsViewable) { delete("Before unmapping parent map-state of child was %s, expecting IsViewable", mapstatename(atts.map_state)); return; @@ -325,7 +325,7 @@ XWindowAttributes atts; XCALL; - (void) XGetWindowAttributes(display, ch, &atts); + XGetWindowAttributes(display, ch, &atts); if (atts.map_state != IsUnviewable) { report("After unmap map-state was %s, expecting IsUnviewable", mapstatename(atts.map_state)); diff --git a/xts5/Xlib5/XChangeProperty.m b/xts5/Xlib5/XChangeProperty.m index 8a2b5708..c8737a0c 100644 --- a/xts5/Xlib5/XChangeProperty.m +++ b/xts5/Xlib5/XChangeProperty.m @@ -737,7 +737,7 @@ Atom atm; XCALL; /* Close new client. */ - (void) XCloseDisplay(display2); + XCloseDisplay(display2); /* Allow time for the client to close. */ reset_delay(); diff --git a/xts5/Xlib5/XGetWindowProperty.m b/xts5/Xlib5/XGetWindowProperty.m index 895adb5a..5535d376 100644 --- a/xts5/Xlib5/XGetWindowProperty.m +++ b/xts5/Xlib5/XGetWindowProperty.m @@ -241,7 +241,7 @@ char *data = "a tested property"; } else FAIL; - (void) strncpy((char *)cbuf, &(data[12]), 4); + strncpy((char *)cbuf, &(data[12]), 4); cbuf[4] = '\0'; if (prop == (unsigned char *)NULL) { diff --git a/xts5/Xlib5/XInternAtom.m b/xts5/Xlib5/XInternAtom.m index 1bd3d1d0..21ba12d4 100644 --- a/xts5/Xlib5/XInternAtom.m +++ b/xts5/Xlib5/XInternAtom.m @@ -404,7 +404,7 @@ Display *display2; CHECK; /* Close display2. */ - (void) XCloseDisplay(display2); + XCloseDisplay(display2); /* Allow sufficient time for the server to register the close display */ reset_delay(); @@ -470,7 +470,7 @@ Atom atom_return; CHECK; /* Close the last connection to the server. */ - (void) XCloseDisplay(display); + XCloseDisplay(display); /* Allow sufficient time for the server to register the close display */ reset_delay(); diff --git a/xts5/Xlib5/XQueryPointer.m b/xts5/Xlib5/XQueryPointer.m index 0eb0c641..567eb869 100644 --- a/xts5/Xlib5/XQueryPointer.m +++ b/xts5/Xlib5/XQueryPointer.m @@ -147,7 +147,7 @@ Verify that the correct root window and pointer position were returned Bool ret; /* Call XWarpPointer to move pointer to a known position */ - (void) warppointer(display, DefaultRootWindow(display), XQP_X, XQP_Y); + warppointer(display, DefaultRootWindow(display), XQP_X, XQP_Y); /* Call xname to obtain pointer position */ w = DefaultRootWindow(display); @@ -215,7 +215,7 @@ Bool ret; } /* Ensure that pointer is not on the alternate screen */ - (void) warppointer(display, DefaultRootWindow(display), XQP_X, XQP_Y); + warppointer(display, DefaultRootWindow(display), XQP_X, XQP_Y); /* Call xname to obtain pointer position on alternate screen */ set_variables(); @@ -289,7 +289,7 @@ Bool ret; rc = makewinpos(display, vp, XQP_X-1, XQP_Y-1); /* Ensure the pointer is over the child by calling warppointer() */ - (void) warppointer(display, DefaultRootWindow(display), + warppointer(display, DefaultRootWindow(display), XQP_X+10, XQP_Y+5); /* Call xname to obtain pointer position */ @@ -362,7 +362,7 @@ Bool ret; w = defwin(display); /* Ensure the pointer is over the window by calling warppointer() */ - (void) warppointer(display, w, 10, 5); + warppointer(display, w, 10, 5); /* Call xname to obtain pointer position */ set_variables(); diff --git a/xts5/Xlib9/XGetImage.m b/xts5/Xlib9/XGetImage.m index 5a382ca8..8185fb39 100644 --- a/xts5/Xlib9/XGetImage.m +++ b/xts5/Xlib9/XGetImage.m @@ -294,9 +294,9 @@ static struct area area2 = /* Destroy images using XDestroyImage. */ if (im1 != (XImage *) 0) - (void) XDestroyImage(im1); + XDestroyImage(im1); if (im2 != (XImage *) 0) - (void) XDestroyImage(im2); + XDestroyImage(im2); /* Repeat for each visual. */ } @@ -402,9 +402,9 @@ unsigned long pix; CHECK; /* Destroy images using XDestroyImage. */ if (im1 != (XImage *) 0) - (void) XDestroyImage(im1); + XDestroyImage(im1); if (im2 != (XImage *) 0) - (void) XDestroyImage(im2); + XDestroyImage(im2); /* Repeat for each planemask. */ } @@ -533,9 +533,9 @@ unsigned long pix; CHECK; /* Destroy images using XDestroyImage. */ if (im1 != (XImage *) 0) - (void) XDestroyImage(im1); + XDestroyImage(im1); if (im2 != (XImage *) 0) - (void) XDestroyImage(im2); + XDestroyImage(im2); /* Repeat for each planemask. */ } @@ -660,9 +660,9 @@ static struct area area1 = /* Destroy images using XDestroyImage. */ if (im1 != (XImage *) 0) - (void) XDestroyImage(im1); + XDestroyImage(im1); if (im2 != (XImage *) 0) - (void) XDestroyImage(im2); + XDestroyImage(im2); /* Repeat for each type-window visual. */ } @@ -740,10 +740,10 @@ static struct area area = XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Save initial pointer location. */ - (void) XQueryPointer(display, w, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, w, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to drawable. */ XWarpPointer(display, None, w, 0, 0, 0, 0, 0, 0); @@ -791,7 +791,7 @@ static struct area area = XWarpPointer(display, None, w, W_STDWIDTH*2, W_STDHEIGHT*2, 0, 0, 0, 0); /* Get new pointer location. */ - (void) XQueryPointer(display, w, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, w, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp); /* Call XGetImage with pointer outside drawable. */ pre_xcall(w, &area, AllPlanes, ZPixmap); @@ -829,7 +829,7 @@ static struct area area = XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); diff --git a/xts5/Xlib9/XGetSubImage.m b/xts5/Xlib9/XGetSubImage.m index d50c392e..64b6082e 100644 --- a/xts5/Xlib9/XGetSubImage.m +++ b/xts5/Xlib9/XGetSubImage.m @@ -932,10 +932,10 @@ static struct area area = XGrabServer(display); /* Enable synchronization. */ - (void) XSynchronize(display, True); + XSynchronize(display, True); /* Save initial pointer location. */ - (void) XQueryPointer(display, w, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, w, &oldroot, &wtmp, &sroot_x, &sroot_y, &itmp, &itmp, &uitmp); /* Warp pointer to drawable. */ XWarpPointer(display, None, w, 0, 0, 0, 0, 0, 0); @@ -979,7 +979,7 @@ static struct area area = XWarpPointer(display, None, w, W_STDWIDTH*2, W_STDHEIGHT*2, 0, 0, 0, 0); /* Get new pointer location. */ - (void) XQueryPointer(display, w, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp); + XQueryPointer(display, w, &wtmp, &wtmp, &oroot_x, &oroot_y, &itmp, &itmp, &uitmp); /* Call XGetSubImage with pointer outside drawable. */ pre_xcall(w, &area, AllPlanes, ZPixmap, &area); @@ -1013,7 +1013,7 @@ static struct area area = XWarpPointer(display, None, oldroot, 0, 0, 0, 0, sroot_x, sroot_y); /* Disable synchronization. */ - (void) XSynchronize(display, False); + XSynchronize(display, False); /* Ungrab server. */ XUngrabServer(display); diff --git a/xts5/Xopen/XAllocNamedColor.m b/xts5/Xopen/XAllocNamedColor.m index 174d10fb..0c169733 100644 --- a/xts5/Xopen/XAllocNamedColor.m +++ b/xts5/Xopen/XAllocNamedColor.m @@ -780,7 +780,7 @@ static char *list[] = { "gray", "grey", "dark gray", "dark grey" }; if( (vmask = visualsupported(display, 1L<<GrayScale)) != 0L) { resetsupvis(vmask); - (void) nextsupvis(&vp); + nextsupvis(&vp); if(vp->colormap_size < 4) vmask = 0L; } @@ -789,7 +789,7 @@ static char *list[] = { "gray", "grey", "dark gray", "dark grey" }; if( (vmask |= visualsupported(display, 1L<<StaticGray)) | StaticGray) { resetsupvis(1L<<StaticGray); - (void) nextsupvis(&vp); + nextsupvis(&vp); if(vp->colormap_size < 4) vmask &= ~(1L<<StaticGray); } diff --git a/xts5/Xopen/XLookupColor.m b/xts5/Xopen/XLookupColor.m index ed870d6d..a55557d9 100644 --- a/xts5/Xopen/XLookupColor.m +++ b/xts5/Xopen/XLookupColor.m @@ -761,7 +761,7 @@ static char *list[] = { "gray", "grey", "dark gray", "dark grey" }; if( (vmask = visualsupported(display, 1L<<GrayScale)) != 0L) { resetsupvis(vmask); - (void) nextsupvis(&vp); + nextsupvis(&vp); if(vp->colormap_size < 4) vmask = 0L; } @@ -770,7 +770,7 @@ static char *list[] = { "gray", "grey", "dark gray", "dark grey" }; if( (vmask |= visualsupported(display, 1L<<StaticGray)) | StaticGray) { resetsupvis(1L<<StaticGray); - (void) nextsupvis(&vp); + nextsupvis(&vp); if(vp->colormap_size < 4) vmask &= ~(1L<<StaticGray); } diff --git a/xts5/Xproto/pAllocColor.m b/xts5/Xproto/pAllocColor.m index 2bf7fd90..ed912c54 100644 --- a/xts5/Xproto/pAllocColor.m +++ b/xts5/Xproto/pAllocColor.m @@ -139,8 +139,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_AllocColor); Send_Req(CLIENT, (xReq *) req); @@ -155,18 +155,18 @@ tester() Log_Trace("client %d received AllocColor reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent AllocColor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong AllocColor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pAllocColorCells.m b/xts5/Xproto/pAllocColorCells.m index 40af1c02..c697cebc 100644 --- a/xts5/Xproto/pAllocColorCells.m +++ b/xts5/Xproto/pAllocColorCells.m @@ -143,8 +143,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_AllocColorCells); Send_Req(CLIENT, (xReq *) req); @@ -169,18 +169,18 @@ tester() Log_Trace("client %d received Alloc error\n", CLIENT); Free_Error(err); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent AllocColorCells request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong AllocColorCells request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pAllocColorPlanes.m b/xts5/Xproto/pAllocColorPlanes.m index f73f68ee..005f6bd7 100644 --- a/xts5/Xproto/pAllocColorPlanes.m +++ b/xts5/Xproto/pAllocColorPlanes.m @@ -143,8 +143,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_AllocColorPlanes); Send_Req(CLIENT, (xReq *) req); @@ -169,18 +169,18 @@ tester() Log_Trace("client %d received Alloc error\n", CLIENT); Free_Error(err); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent AllocColorPlanes request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong AllocColorPlanes request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pAllocNamedColor.m b/xts5/Xproto/pAllocNamedColor.m index e03434cc..1cf7f8fe 100644 --- a/xts5/Xproto/pAllocNamedColor.m +++ b/xts5/Xproto/pAllocNamedColor.m @@ -139,8 +139,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_AllocNamedColor); Send_Req(CLIENT, (xReq *) req); @@ -155,18 +155,18 @@ tester() Log_Trace("client %d received AllocNamedColor reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent AllocNamedColor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong AllocNamedColor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pAllowEvents.m b/xts5/Xproto/pAllowEvents.m index c58cb042..ac9c4987 100644 --- a/xts5/Xproto/pAllowEvents.m +++ b/xts5/Xproto/pAllowEvents.m @@ -131,7 +131,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gpr = (xGrabPointerReq *) Make_Req(CLIENT, X_GrabPointer); gpr->pointerMode = GrabModeSync; @@ -146,7 +146,7 @@ tester() /* do any reply checking here */ Free_Reply(gprep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gpr); Set_Test_Type(CLIENT, test_type); @@ -156,18 +156,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default AllowEvents request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent AllowEvents request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong AllowEvents request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pBadRequest.m b/xts5/Xproto/pBadRequest.m index 9f22ba03..97e3b879 100644 --- a/xts5/Xproto/pBadRequest.m +++ b/xts5/Xproto/pBadRequest.m @@ -148,7 +148,7 @@ bad_request() Free_Error(err); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Exit_OK(); } diff --git a/xts5/Xproto/pBell.m b/xts5/Xproto/pBell.m index 6170f24e..f824978a 100644 --- a/xts5/Xproto/pBell.m +++ b/xts5/Xproto/pBell.m @@ -136,18 +136,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default Bell request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent Bell request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong Bell request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeActivePointerGrab.m b/xts5/Xproto/pChangeActivePointerGrab.m index a68426b8..20b02cd3 100644 --- a/xts5/Xproto/pChangeActivePointerGrab.m +++ b/xts5/Xproto/pChangeActivePointerGrab.m @@ -131,7 +131,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gpr = (xGrabPointerReq *) Make_Req(CLIENT, X_GrabPointer); Send_Req(CLIENT, (xReq *) gpr); @@ -145,7 +145,7 @@ tester() /* do any reply checking here */ Free_Reply(gprep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gpr); Set_Test_Type(CLIENT, test_type); @@ -155,18 +155,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeActivePointerGrab request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeActivePointerGrab request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeActivePointerGrab request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeGC.m b/xts5/Xproto/pChangeGC.m index 9429bbaf..5b9321f9 100644 --- a/xts5/Xproto/pChangeGC.m +++ b/xts5/Xproto/pChangeGC.m @@ -129,8 +129,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_GContext(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xChangeGCReq *) Make_Req(CLIENT, X_ChangeGC); @@ -144,23 +144,23 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeGC request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent ChangeGC request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeGC request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeGC request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeHosts.m b/xts5/Xproto/pChangeHosts.m index 5d3cd388..3731e625 100644 --- a/xts5/Xproto/pChangeHosts.m +++ b/xts5/Xproto/pChangeHosts.m @@ -207,18 +207,18 @@ debug(3,"post-send length of req = %d, req at 0x%lx\n",req->length,(unsigned lon case GOOD: Log_Trace("client %d sent default ChangeHosts request\n", CLIENT); Log_Trace("\t(BadAccess probably indicates not on local/privileged machine)\n"); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeHosts request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeHosts request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", @@ -235,7 +235,7 @@ debug(3,"post-send length of req = %d, req at 0x%lx\n",req->length,(unsigned lon Set_Test_Type(CLIENT, SETUP); req->mode = (mode == HostInsert) ? HostDelete : HostInsert; Send_Req(CLIENT, (xReq *) req); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } Free_Req(hosts_req); diff --git a/xts5/Xproto/pChangeKeyboardControl.m b/xts5/Xproto/pChangeKeyboardControl.m index 7c0cedb6..00ef6bfa 100644 --- a/xts5/Xproto/pChangeKeyboardControl.m +++ b/xts5/Xproto/pChangeKeyboardControl.m @@ -142,7 +142,7 @@ tester() Log_Trace("client %d received GetKeyboardControl reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xChangeKeyboardControlReq *) Make_Req(CLIENT, X_ChangeKeyboardControl); @@ -157,23 +157,23 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeKeyboardControl request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent ChangeKeyboardControl request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeKeyboardControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeKeyboardControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeKeyboardMapping.m b/xts5/Xproto/pChangeKeyboardMapping.m index 7bb61ea1..e872c055 100644 --- a/xts5/Xproto/pChangeKeyboardMapping.m +++ b/xts5/Xproto/pChangeKeyboardMapping.m @@ -145,7 +145,7 @@ tester() Log_Trace("client %d received GetKeyboardMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); /* ... then make a request to duplicate that mapping. */ @@ -179,18 +179,18 @@ tester() /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeKeyboardMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeKeyboardMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangePointerControl.m b/xts5/Xproto/pChangePointerControl.m index 5ea67869..cfd73df4 100644 --- a/xts5/Xproto/pChangePointerControl.m +++ b/xts5/Xproto/pChangePointerControl.m @@ -142,7 +142,7 @@ tester() Log_Trace("client %d received GetPointerControl reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xChangePointerControlReq *) Make_Req(CLIENT, X_ChangePointerControl); @@ -154,18 +154,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangePointerControl request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangePointerControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangePointerControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeProperty.m b/xts5/Xproto/pChangeProperty.m index a638eece..25322b2f 100644 --- a/xts5/Xproto/pChangeProperty.m +++ b/xts5/Xproto/pChangeProperty.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_Property = Create_Default_Atom(CLIENT); Set_Test_Type(CLIENT, test_type); @@ -141,18 +141,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeProperty request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeProperty request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeProperty request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeSaveSet.m b/xts5/Xproto/pChangeSaveSet.m index 576791e3..33d61c1c 100644 --- a/xts5/Xproto/pChangeSaveSet.m +++ b/xts5/Xproto/pChangeSaveSet.m @@ -144,18 +144,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeSaveSet request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeSaveSet request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeSaveSet request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pChangeWindowAttributes.m b/xts5/Xproto/pChangeWindowAttributes.m index d1b2d378..fb7e4268 100644 --- a/xts5/Xproto/pChangeWindowAttributes.m +++ b/xts5/Xproto/pChangeWindowAttributes.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xChangeWindowAttributesReq *) Make_Req(CLIENT, X_ChangeWindowAttributes); @@ -143,23 +143,23 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ChangeWindowAttributes request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent ChangeWindowAttributes request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ChangeWindowAttributes request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ChangeWindowAttributes request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCirculateWindow.m b/xts5/Xproto/pCirculateWindow.m index 14d6bdd1..38bfb564 100644 --- a/xts5/Xproto/pCirculateWindow.m +++ b/xts5/Xproto/pCirculateWindow.m @@ -140,14 +140,14 @@ tester() cwr->parent = Default_Window; Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent additional CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cwr); cwr = (xCreateWindowReq *) Make_Req(CLIENT, X_CreateWindow); cwr->parent = Default_Window; Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent additional CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cwr); mwr = (xResourceReq *) Make_Req(CLIENT, X_MapWindow); @@ -162,7 +162,7 @@ tester() /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(mwr); mwr = (xResourceReq *) Make_Req(CLIENT, X_MapSubwindows); @@ -184,7 +184,7 @@ tester() Log_Trace("client %d received second Expose\n", CLIENT); /* do any event checking here */ Free_Event(ev); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } Free_Req(mwr); @@ -205,18 +205,18 @@ tester() Free_Event(ev); } } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CirculateWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CirculateWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pClearArea.m b/xts5/Xproto/pClearArea.m index f969a7a7..4e6a6c0e 100644 --- a/xts5/Xproto/pClearArea.m +++ b/xts5/Xproto/pClearArea.m @@ -149,18 +149,18 @@ tester() /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ClearArea request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ClearArea request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCloseFont.m b/xts5/Xproto/pCloseFont.m index e2a10f41..147f0d8c 100644 --- a/xts5/Xproto/pCloseFont.m +++ b/xts5/Xproto/pCloseFont.m @@ -143,18 +143,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CloseFont request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CloseFont request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CloseFont request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pConfigureWindow.m b/xts5/Xproto/pConfigureWindow.m index 087f092c..038bb8a9 100644 --- a/xts5/Xproto/pConfigureWindow.m +++ b/xts5/Xproto/pConfigureWindow.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xConfigureWindowReq *) Make_Req(CLIENT, X_ConfigureWindow); @@ -143,23 +143,23 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ConfigureWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent ConfigureWindow request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ConfigureWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ConfigureWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pConvertSelection.m b/xts5/Xproto/pConvertSelection.m index be488294..af1468e6 100644 --- a/xts5/Xproto/pConvertSelection.m +++ b/xts5/Xproto/pConvertSelection.m @@ -134,7 +134,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_Property = Create_Default_Atom(CLIENT); Set_Test_Type(CLIENT, test_type); @@ -151,18 +151,18 @@ tester() Log_Trace("client %d received SelectionNotify\n", CLIENT); Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ConvertSelection request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ConvertSelection request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCopyArea.m b/xts5/Xproto/pCopyArea.m index c9757e65..fb922fe8 100644 --- a/xts5/Xproto/pCopyArea.m +++ b/xts5/Xproto/pCopyArea.m @@ -133,7 +133,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -151,18 +151,18 @@ tester() /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CopyArea request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CopyArea request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCopyColormapAndFree.m b/xts5/Xproto/pCopyColormapAndFree.m index 0e1d72bd..e58a6fb4 100644 --- a/xts5/Xproto/pCopyColormapAndFree.m +++ b/xts5/Xproto/pCopyColormapAndFree.m @@ -140,8 +140,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* Allocate color cells if client hasn't got any */ @@ -159,14 +159,14 @@ tester() } Free_Req(req); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_CopyColormapAndFree); if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CopyColormapAndFree request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->id = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -176,28 +176,28 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CopyColormapAndFree request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CopyColormapAndFree request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CopyColormapAndFree request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CopyColormapAndFree request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CopyColormapAndFree request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCopyGC.m b/xts5/Xproto/pCopyGC.m index d5bd53ba..f7bee1e0 100644 --- a/xts5/Xproto/pCopyGC.m +++ b/xts5/Xproto/pCopyGC.m @@ -131,14 +131,14 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gc1 = Create_Default_GContext(CLIENT); gc2 = Create_GContext(CLIENT); cgcr = (xChangeGCReq *) Make_Req(CLIENT, X_ChangeGC); Send_Req(CLIENT, (xReq *) cgcr); Log_Trace("client %d sent default ChangeGC request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cgcr); Set_Test_Type(CLIENT, test_type); @@ -153,23 +153,23 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CopyGC request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent CopyGC request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CopyGC request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CopyGC request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCopyPlane.m b/xts5/Xproto/pCopyPlane.m index b87e23cb..a80d1e62 100644 --- a/xts5/Xproto/pCopyPlane.m +++ b/xts5/Xproto/pCopyPlane.m @@ -132,7 +132,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -150,18 +150,18 @@ tester() /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CopyPlane request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CopyPlane request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCreateColormap.m b/xts5/Xproto/pCreateColormap.m index add350e8..4683bc71 100644 --- a/xts5/Xproto/pCreateColormap.m +++ b/xts5/Xproto/pCreateColormap.m @@ -139,14 +139,14 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xCreateColormapReq *) Make_Req(CLIENT, X_CreateColormap); if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CreateColormap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->mid = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -156,28 +156,28 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CreateColormap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CreateColormap request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CreateColormap request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CreateColormap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CreateColormap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCreateCursor.m b/xts5/Xproto/pCreateCursor.m index bd0e3e7b..5c6bc129 100644 --- a/xts5/Xproto/pCreateCursor.m +++ b/xts5/Xproto/pCreateCursor.m @@ -139,7 +139,7 @@ tester() if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CreateCursor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->cid = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -149,28 +149,28 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CreateCursor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CreateCursor request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CreateCursor request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CreateCursor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CreateCursor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCreateGC.m b/xts5/Xproto/pCreateGC.m index a285a086..2bfd4ecc 100644 --- a/xts5/Xproto/pCreateGC.m +++ b/xts5/Xproto/pCreateGC.m @@ -129,14 +129,14 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xCreateGCReq *) Make_Req(CLIENT, X_CreateGC); if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CreateGC request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->gc = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -151,33 +151,33 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CreateGC request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CreateGC request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CreateGC request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent CreateGC request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CreateGC request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CreateGC request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCreateGlyphCursor.m b/xts5/Xproto/pCreateGlyphCursor.m index e3e2c352..a3f0bcc7 100644 --- a/xts5/Xproto/pCreateGlyphCursor.m +++ b/xts5/Xproto/pCreateGlyphCursor.m @@ -133,15 +133,15 @@ tester() Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Font(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Font(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xCreateGlyphCursorReq *) Make_Req(CLIENT, X_CreateGlyphCursor); if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CreateGlyphCursor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->cid = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -151,28 +151,28 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CreateGlyphCursor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CreateGlyphCursor request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CreateGlyphCursor request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CreateGlyphCursor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CreateGlyphCursor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCreatePixmap.m b/xts5/Xproto/pCreatePixmap.m index 2b806bc6..2e538467 100644 --- a/xts5/Xproto/pCreatePixmap.m +++ b/xts5/Xproto/pCreatePixmap.m @@ -129,14 +129,14 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xCreatePixmapReq *) Make_Req(CLIENT, X_CreatePixmap); if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CreatePixmap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->pid = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -146,28 +146,28 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CreatePixmap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CreatePixmap request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CreatePixmap request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CreatePixmap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CreatePixmap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pCreateWindow.m b/xts5/Xproto/pCreateWindow.m index 95614f45..9b5e2bc4 100644 --- a/xts5/Xproto/pCreateWindow.m +++ b/xts5/Xproto/pCreateWindow.m @@ -138,7 +138,7 @@ tester() if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->wid = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -153,33 +153,33 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent CreateWindow request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent CreateWindow request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_VALUE: Log_Trace("client %d sent CreateWindow request with illegal mask\n", CLIENT); - (void) Expect_BadValue(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadValue(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent CreateWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong CreateWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pDeleteProperty.m b/xts5/Xproto/pDeleteProperty.m index 6b1053e8..633a38d1 100644 --- a/xts5/Xproto/pDeleteProperty.m +++ b/xts5/Xproto/pDeleteProperty.m @@ -131,14 +131,14 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_Property = Create_Default_Atom(CLIENT); cpr = (xChangePropertyReq *) Make_Req(CLIENT, X_ChangeProperty); cpr->property = Test_Property; Send_Req(CLIENT, (xReq *) cpr); Log_Trace("client %d sent default ChangeProperty request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cpr); Set_Test_Type(CLIENT, test_type); @@ -149,18 +149,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default DeleteProperty request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent DeleteProperty request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong DeleteProperty request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pDestroySubwindows.m b/xts5/Xproto/pDestroySubwindows.m index f9eca87e..4b413368 100644 --- a/xts5/Xproto/pDestroySubwindows.m +++ b/xts5/Xproto/pDestroySubwindows.m @@ -137,7 +137,7 @@ tester() cwr->parent = Default_Window; Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent additional CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cwr); Set_Test_Type(CLIENT, test_type); @@ -147,18 +147,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default DestroySubwindows request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent DestroySubwindows request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong DestroySubwindows request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pDestroyWindow.m b/xts5/Xproto/pDestroyWindow.m index 9ea4591d..2acc3cb4 100644 --- a/xts5/Xproto/pDestroyWindow.m +++ b/xts5/Xproto/pDestroyWindow.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_DestroyWindow); @@ -138,18 +138,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default DestroyWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent DestroyWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong DestroyWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pFillPoly.m b/xts5/Xproto/pFillPoly.m index aab937b0..149152f6 100644 --- a/xts5/Xproto/pFillPoly.m +++ b/xts5/Xproto/pFillPoly.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default FillPoly request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent FillPoly request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong FillPoly request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pForceScreenSaver.m b/xts5/Xproto/pForceScreenSaver.m index bd2c5b57..9a4980a3 100644 --- a/xts5/Xproto/pForceScreenSaver.m +++ b/xts5/Xproto/pForceScreenSaver.m @@ -137,19 +137,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ForceScreenSaver request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent ForceScreenSaver request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ForceScreenSaver request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pFreeColormap.m b/xts5/Xproto/pFreeColormap.m index a0203d2c..753d7fb0 100644 --- a/xts5/Xproto/pFreeColormap.m +++ b/xts5/Xproto/pFreeColormap.m @@ -139,8 +139,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_FreeColormap); Send_Req(CLIENT, (xReq *) req); @@ -148,18 +148,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default FreeColormap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent FreeColormap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong FreeColormap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pFreeColors.m b/xts5/Xproto/pFreeColors.m index a98fef0f..f9373c7a 100644 --- a/xts5/Xproto/pFreeColors.m +++ b/xts5/Xproto/pFreeColors.m @@ -146,8 +146,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* allocate a color and store pixel from reply in global */ @@ -161,7 +161,7 @@ tester() Log_Trace("client %d received AllocNamedColor reply\n", CLIENT); } reply_pixel = alloc_reply->pixel; - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); /* free the allocated color cell */ @@ -172,18 +172,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default FreeColors request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent FreeColors request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong FreeColors request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pFreeCursor.m b/xts5/Xproto/pFreeCursor.m index c637e575..df3016a8 100644 --- a/xts5/Xproto/pFreeCursor.m +++ b/xts5/Xproto/pFreeCursor.m @@ -129,9 +129,9 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Cursor_Pixmap(CLIENT); - (void) Create_Default_Cursor(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Cursor_Pixmap(CLIENT); + Create_Default_Cursor(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_FreeCursor); @@ -140,18 +140,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default FreeCursor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent FreeCursor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong FreeCursor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pFreeGC.m b/xts5/Xproto/pFreeGC.m index 3df9427a..f67fa8c4 100644 --- a/xts5/Xproto/pFreeGC.m +++ b/xts5/Xproto/pFreeGC.m @@ -129,8 +129,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_GContext(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_FreeGC); @@ -139,18 +139,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default FreeGC request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent FreeGC request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong FreeGC request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pFreePixmap.m b/xts5/Xproto/pFreePixmap.m index 3dcd74a2..cb0e7924 100644 --- a/xts5/Xproto/pFreePixmap.m +++ b/xts5/Xproto/pFreePixmap.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Default_Pixmap = Create_Default_Pixmap(CLIENT); Set_Test_Type(CLIENT, test_type); @@ -140,18 +140,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default FreePixmap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent FreePixmap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong FreePixmap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetAtomName.m b/xts5/Xproto/pGetAtomName.m index 2421d994..fa192214 100644 --- a/xts5/Xproto/pGetAtomName.m +++ b/xts5/Xproto/pGetAtomName.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetAtomName request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetAtomName request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetFontPath.m b/xts5/Xproto/pGetFontPath.m index 16c60725..2ac44f94 100644 --- a/xts5/Xproto/pGetFontPath.m +++ b/xts5/Xproto/pGetFontPath.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetFontPath request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetFontPath request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetGeometry.m b/xts5/Xproto/pGetGeometry.m index a3a1a1a0..e6bf5e1d 100644 --- a/xts5/Xproto/pGetGeometry.m +++ b/xts5/Xproto/pGetGeometry.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_GetGeometry); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetGeometry request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetGeometry request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetImage.m b/xts5/Xproto/pGetImage.m index ef5f5731..b4a203d4 100644 --- a/xts5/Xproto/pGetImage.m +++ b/xts5/Xproto/pGetImage.m @@ -133,13 +133,13 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); prr = (xPolyRectangleReq *) Make_Req(CLIENT, X_PolyRectangle); Send_Req(CLIENT, (xReq *) prr); Log_Trace("client %d sent pixmap PolyRectangle request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); Set_Test_Type(CLIENT, test_type); @@ -150,19 +150,19 @@ tester() case GOOD: Log_Trace("client %d sent default GetImage request\n", CLIENT); rep = (xGetImageReply *) Expect_Reply(CLIENT, X_GetImage); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Reply(rep); break; case BAD_LENGTH: Log_Trace("client %d sent GetImage request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetImage request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetInputFocus.m b/xts5/Xproto/pGetInputFocus.m index 24cc8d0d..45b3a751 100644 --- a/xts5/Xproto/pGetInputFocus.m +++ b/xts5/Xproto/pGetInputFocus.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetInputFocus request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetInputFocus request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetKeyboardControl.m b/xts5/Xproto/pGetKeyboardControl.m index b6fa404f..6d722dc1 100644 --- a/xts5/Xproto/pGetKeyboardControl.m +++ b/xts5/Xproto/pGetKeyboardControl.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetKeyboardControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetKeyboardControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetKeyboardMapping.m b/xts5/Xproto/pGetKeyboardMapping.m index 91e69087..b6ae6e43 100644 --- a/xts5/Xproto/pGetKeyboardMapping.m +++ b/xts5/Xproto/pGetKeyboardMapping.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetKeyboardMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetKeyboardMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetModifierMapping.m b/xts5/Xproto/pGetModifierMapping.m index 2edf3090..62749fb0 100644 --- a/xts5/Xproto/pGetModifierMapping.m +++ b/xts5/Xproto/pGetModifierMapping.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetModifierMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetModifierMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetMotionEvents.m b/xts5/Xproto/pGetMotionEvents.m index 06487ee0..3f688376 100644 --- a/xts5/Xproto/pGetMotionEvents.m +++ b/xts5/Xproto/pGetMotionEvents.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xGetMotionEventsReq *) Make_Req(CLIENT, X_GetMotionEvents); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetMotionEvents request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetMotionEvents request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetPointerControl.m b/xts5/Xproto/pGetPointerControl.m index 95f7100a..2c9e7a5b 100644 --- a/xts5/Xproto/pGetPointerControl.m +++ b/xts5/Xproto/pGetPointerControl.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetPointerControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetPointerControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetPointerMapping.m b/xts5/Xproto/pGetPointerMapping.m index a67f361a..00e1fcc9 100644 --- a/xts5/Xproto/pGetPointerMapping.m +++ b/xts5/Xproto/pGetPointerMapping.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetPointerMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetPointerMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetProperty.m b/xts5/Xproto/pGetProperty.m index d8cd2860..9506c867 100644 --- a/xts5/Xproto/pGetProperty.m +++ b/xts5/Xproto/pGetProperty.m @@ -132,14 +132,14 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_Property = Create_Default_Atom(CLIENT); cpr = (xChangePropertyReq *) Make_Req(CLIENT, X_ChangeProperty); cpr->property = Test_Property; Send_Req(CLIENT, (xReq *) cpr); Log_Trace("client %d sent default ChangeProperty request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cpr); Set_Test_Type(CLIENT, test_type); @@ -158,18 +158,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetProperty request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetProperty request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetScreenSaver.m b/xts5/Xproto/pGetScreenSaver.m index 3d0752e5..95746b2d 100644 --- a/xts5/Xproto/pGetScreenSaver.m +++ b/xts5/Xproto/pGetScreenSaver.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetScreenSaver request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetScreenSaver request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetSelectionOwner.m b/xts5/Xproto/pGetSelectionOwner.m index daa5d552..635f5c48 100644 --- a/xts5/Xproto/pGetSelectionOwner.m +++ b/xts5/Xproto/pGetSelectionOwner.m @@ -132,13 +132,13 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_Property = Create_Default_Atom(CLIENT); ssor = (xSetSelectionOwnerReq *) Make_Req(CLIENT, X_SetSelectionOwner); Send_Req(CLIENT, (xReq *) ssor); Log_Trace("client %d sent default SetSelectionOwner request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(ssor); Set_Test_Type(CLIENT, test_type); @@ -155,18 +155,18 @@ tester() Log_Trace("client %d received GetSelectionOwner reply\n", CLIENT); Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetSelectionOwner request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetSelectionOwner request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGetWindowAttributes.m b/xts5/Xproto/pGetWindowAttributes.m index a6ea2ae5..bc22216c 100644 --- a/xts5/Xproto/pGetWindowAttributes.m +++ b/xts5/Xproto/pGetWindowAttributes.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_GetWindowAttributes); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GetWindowAttributes request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GetWindowAttributes request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGrabButton.m b/xts5/Xproto/pGrabButton.m index 6b0a0f4f..319a6895 100644 --- a/xts5/Xproto/pGrabButton.m +++ b/xts5/Xproto/pGrabButton.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xGrabButtonReq *) Make_Req(CLIENT, X_GrabButton); @@ -138,18 +138,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default GrabButton request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabButton request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabButton request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGrabKey.m b/xts5/Xproto/pGrabKey.m index 5dd2c439..028f63c8 100644 --- a/xts5/Xproto/pGrabKey.m +++ b/xts5/Xproto/pGrabKey.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xGrabKeyReq *) Make_Req(CLIENT, X_GrabKey); @@ -138,18 +138,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default GrabKey request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabKey request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabKey request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGrabKeyboard.m b/xts5/Xproto/pGrabKeyboard.m index 80f31eee..39366f6b 100644 --- a/xts5/Xproto/pGrabKeyboard.m +++ b/xts5/Xproto/pGrabKeyboard.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xGrabKeyboardReq *) Make_Req(CLIENT, X_GrabKeyboard); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabKeyboard request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabKeyboard request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGrabPointer.m b/xts5/Xproto/pGrabPointer.m index fe5e66c1..02bcb8bc 100644 --- a/xts5/Xproto/pGrabPointer.m +++ b/xts5/Xproto/pGrabPointer.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xGrabPointerReq *) Make_Req(CLIENT, X_GrabPointer); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabPointer request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabPointer request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pGrabServer.m b/xts5/Xproto/pGrabServer.m index 70598c5b..5b2c6d17 100644 --- a/xts5/Xproto/pGrabServer.m +++ b/xts5/Xproto/pGrabServer.m @@ -129,7 +129,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xReq *) Make_Req(CLIENT, X_GrabServer); @@ -138,18 +138,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default GrabServer request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent GrabServer request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong GrabServer request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pImageText16.m b/xts5/Xproto/pImageText16.m index 14740fee..e5f40a78 100644 --- a/xts5/Xproto/pImageText16.m +++ b/xts5/Xproto/pImageText16.m @@ -151,7 +151,7 @@ tester() font_req = (xOpenFontReq *) Add_Counted_Value (font_req, '2'); Send_Req(CLIENT, (xReq *) font_req); Log_Trace("client %d sent default OpenFont request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); /* create a default GContext with xtfont2 as the font */ @@ -177,19 +177,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ImageText16 request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent ImageText16 request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ImageText16 request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pImageText8.m b/xts5/Xproto/pImageText8.m index 9efd8e20..02058a9b 100644 --- a/xts5/Xproto/pImageText8.m +++ b/xts5/Xproto/pImageText8.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ImageText8 request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent ImageText8 request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ImageText8 request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pInstallColormap.m b/xts5/Xproto/pInstallColormap.m index 1f195be5..c8fd313c 100644 --- a/xts5/Xproto/pInstallColormap.m +++ b/xts5/Xproto/pInstallColormap.m @@ -143,8 +143,8 @@ tester() Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* Allocate color cells if client hasn't got any */ @@ -162,7 +162,7 @@ tester() } Free_Req(req); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_InstallColormap); @@ -171,18 +171,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default InstallColormap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent InstallColormap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong InstallColormap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pInternAtom.m b/xts5/Xproto/pInternAtom.m index 4fa09347..cda364bc 100644 --- a/xts5/Xproto/pInternAtom.m +++ b/xts5/Xproto/pInternAtom.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent InternAtom request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong InternAtom request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pKillClient.m b/xts5/Xproto/pKillClient.m index a646bc23..e5372dc2 100644 --- a/xts5/Xproto/pKillClient.m +++ b/xts5/Xproto/pKillClient.m @@ -133,7 +133,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(VICTIM); - (void) Create_Default_GContext(VICTIM); + Create_Default_GContext(VICTIM); /* We can't send anything on the VICTIM client to see if it's really been killed. If we do, the library will see "Connection @@ -147,18 +147,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default KillClient request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent KillClient request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong KillClient request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pListExtensions.m b/xts5/Xproto/pListExtensions.m index 2fb6d2bf..ea064b3d 100644 --- a/xts5/Xproto/pListExtensions.m +++ b/xts5/Xproto/pListExtensions.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListExtensions request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListExtensions request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pListFonts.m b/xts5/Xproto/pListFonts.m index a1ef97fc..741bbb94 100644 --- a/xts5/Xproto/pListFonts.m +++ b/xts5/Xproto/pListFonts.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListFonts request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListFonts request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pListFontsWithInfo.m b/xts5/Xproto/pListFontsWithInfo.m index 31e6799e..f7a76ed4 100644 --- a/xts5/Xproto/pListFontsWithInfo.m +++ b/xts5/Xproto/pListFontsWithInfo.m @@ -156,18 +156,18 @@ tester() } } Free_Reply(rep); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListFontsWithInfo request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListFontsWithInfo request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pListHosts.m b/xts5/Xproto/pListHosts.m index 48c1d68a..b8553277 100644 --- a/xts5/Xproto/pListHosts.m +++ b/xts5/Xproto/pListHosts.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListHosts request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListHosts request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pListInstalledColormaps.m b/xts5/Xproto/pListInstalledColormaps.m index e4d267cc..a9858129 100644 --- a/xts5/Xproto/pListInstalledColormaps.m +++ b/xts5/Xproto/pListInstalledColormaps.m @@ -142,7 +142,7 @@ tester() Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_ListInstalledColormaps); @@ -159,18 +159,18 @@ tester() /* do any reply checking here */ Free_Reply(reply); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListInstalledColormaps request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListInstalledColormaps request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pListProperties.m b/xts5/Xproto/pListProperties.m index ce88eccb..ed92b18a 100644 --- a/xts5/Xproto/pListProperties.m +++ b/xts5/Xproto/pListProperties.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_ListProperties); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ListProperties request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ListProperties request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pLookupColor.m b/xts5/Xproto/pLookupColor.m index 15b79d93..18a90e05 100644 --- a/xts5/Xproto/pLookupColor.m +++ b/xts5/Xproto/pLookupColor.m @@ -140,8 +140,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_LookupColor); Send_Req(CLIENT, (xReq *) req); @@ -157,18 +157,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent LookupColor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong LookupColor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pMapSubwindows.m b/xts5/Xproto/pMapSubwindows.m index a055ee3d..d005b525 100644 --- a/xts5/Xproto/pMapSubwindows.m +++ b/xts5/Xproto/pMapSubwindows.m @@ -137,7 +137,7 @@ tester() cwr->parent = Default_Window; Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent additional CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cwr); Set_Test_Type(CLIENT, test_type); @@ -147,18 +147,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default MapSubwindows request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent MapSubwindows request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong MapSubwindows request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pMapWindow.m b/xts5/Xproto/pMapWindow.m index beef3bfa..f0d3ec70 100644 --- a/xts5/Xproto/pMapWindow.m +++ b/xts5/Xproto/pMapWindow.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_MapWindow); @@ -147,18 +147,18 @@ tester() /* do any event checking here */ Free_Event(ev); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent MapWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong MapWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pNoOperation.m b/xts5/Xproto/pNoOperation.m index 0e4f11c8..c8fb5ecb 100644 --- a/xts5/Xproto/pNoOperation.m +++ b/xts5/Xproto/pNoOperation.m @@ -136,22 +136,22 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default NoOperation request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent NoOperation request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case JUST_TOO_LONG: /* special for NoOperation, excess bytes allowed and ignored */ Log_Trace("client %d sent excess length NoOperation request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: Log_Trace("client %d sent overlong NoOperation request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pOpenFont.m b/xts5/Xproto/pOpenFont.m index f811672c..642df435 100644 --- a/xts5/Xproto/pOpenFont.m +++ b/xts5/Xproto/pOpenFont.m @@ -138,7 +138,7 @@ tester() if(test_type == BAD_IDCHOICE1) { Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent OpenFont request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); } if(test_type == BAD_IDCHOICE2) { req->fid = 0xffffffff; /* top 2 bits set ==> invalid */ @@ -148,28 +148,28 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default OpenFont request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE1: Log_Trace("client %d sent OpenFont request with same resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_IDCHOICE2: Log_Trace("client %d sent OpenFont request with out-of-range resource ID\n", CLIENT); - (void) Expect_BadIDChoice(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadIDChoice(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent OpenFont request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong OpenFont request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyArc.m b/xts5/Xproto/pPolyArc.m index 0dbaae91..01c2fe4a 100644 --- a/xts5/Xproto/pPolyArc.m +++ b/xts5/Xproto/pPolyArc.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyArc request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyArc request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyArc request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyFillArc.m b/xts5/Xproto/pPolyFillArc.m index de1c373f..a2298604 100644 --- a/xts5/Xproto/pPolyFillArc.m +++ b/xts5/Xproto/pPolyFillArc.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyFillArc request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyFillArc request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyFillArc request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyFillRectangle.m b/xts5/Xproto/pPolyFillRectangle.m index d7a7143c..0bc5a4c6 100644 --- a/xts5/Xproto/pPolyFillRectangle.m +++ b/xts5/Xproto/pPolyFillRectangle.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyFillRectangle request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyFillRectangle request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyFillRectangle request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyLine.m b/xts5/Xproto/pPolyLine.m index 3ef57712..0ba20031 100644 --- a/xts5/Xproto/pPolyLine.m +++ b/xts5/Xproto/pPolyLine.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyLine request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyLine request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyLine request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyPoint.m b/xts5/Xproto/pPolyPoint.m index 28c060dd..dc032f34 100644 --- a/xts5/Xproto/pPolyPoint.m +++ b/xts5/Xproto/pPolyPoint.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyPoint request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyPoint request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyPoint request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyRectangle.m b/xts5/Xproto/pPolyRectangle.m index 8ce153a5..1141f96c 100644 --- a/xts5/Xproto/pPolyRectangle.m +++ b/xts5/Xproto/pPolyRectangle.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyRectangle request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyRectangle request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyRectangle request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolySegment.m b/xts5/Xproto/pPolySegment.m index 5128a46d..ea9061cb 100644 --- a/xts5/Xproto/pPolySegment.m +++ b/xts5/Xproto/pPolySegment.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -141,19 +141,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolySegment request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolySegment request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolySegment request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyText16.m b/xts5/Xproto/pPolyText16.m index 65f7314a..cf0af445 100644 --- a/xts5/Xproto/pPolyText16.m +++ b/xts5/Xproto/pPolyText16.m @@ -151,7 +151,7 @@ tester() font_req = (xOpenFontReq *) Add_Counted_Value (font_req, '2'); Send_Req(CLIENT, (xReq *) font_req); Log_Trace("client %d sent default OpenFont request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); /* create a default GContext with xtfont2 as the font */ @@ -175,19 +175,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyText16 request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyText16 request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyText16 request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPolyText8.m b/xts5/Xproto/pPolyText8.m index 6cd16ba9..a963c964 100644 --- a/xts5/Xproto/pPolyText8.m +++ b/xts5/Xproto/pPolyText8.m @@ -131,7 +131,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); Set_Test_Type(CLIENT, test_type); @@ -143,19 +143,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PolyText8 request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PolyText8 request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PolyText8 request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pPutImage.m b/xts5/Xproto/pPutImage.m index 3cb92bd7..ed251e0b 100644 --- a/xts5/Xproto/pPutImage.m +++ b/xts5/Xproto/pPutImage.m @@ -148,13 +148,13 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Map_Window(CLIENT, win); prr = (xPolyRectangleReq *) Make_Req(CLIENT, X_PolyRectangle); Send_Req(CLIENT, (xReq *) prr); Log_Trace("client %d sent pixmap PolyRectangle request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); req = (xGetImageReq *) Make_Req(CLIENT, X_GetImage); @@ -168,7 +168,7 @@ tester() Log_Trace("client %d received GetImage reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); win = Create_Default_Window(CLIENT); Map_Window(CLIENT, win); @@ -212,19 +212,19 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default PutImage request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Visual_Check(); break; case BAD_LENGTH: Log_Trace("client %d sent PutImage request with bad length (%d)\n", CLIENT, pir->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong PutImage request (%d)\n", CLIENT, pir->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryBestSize.m b/xts5/Xproto/pQueryBestSize.m index 515635c2..3b5c7e71 100644 --- a/xts5/Xproto/pQueryBestSize.m +++ b/xts5/Xproto/pQueryBestSize.m @@ -132,7 +132,7 @@ tester() Create_Client(CLIENT); win = Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_GContext(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xQueryBestSizeReq *) Make_Req(CLIENT, X_QueryBestSize); @@ -149,18 +149,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryBestSize request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryBestSize request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryColors.m b/xts5/Xproto/pQueryColors.m index 0dd1898a..5e2983f5 100644 --- a/xts5/Xproto/pQueryColors.m +++ b/xts5/Xproto/pQueryColors.m @@ -151,8 +151,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* allocate a color and store pixel from reply in global */ @@ -166,7 +166,7 @@ tester() Log_Trace("client %d received AllocNamedColor reply\n", CLIENT); } reply_pixel = alloc_reply->pixel; - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); /* query colors */ @@ -184,18 +184,18 @@ tester() Log_Trace("client %d received QueryColors reply\n", CLIENT); Free_Reply(query_reply); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryColors request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryColors request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryExtension.m b/xts5/Xproto/pQueryExtension.m index 22a9b438..3c87726e 100644 --- a/xts5/Xproto/pQueryExtension.m +++ b/xts5/Xproto/pQueryExtension.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryExtension request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryExtension request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryFont.m b/xts5/Xproto/pQueryFont.m index 729f5f81..77f55dfa 100644 --- a/xts5/Xproto/pQueryFont.m +++ b/xts5/Xproto/pQueryFont.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryFont request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryFont request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryKeymap.m b/xts5/Xproto/pQueryKeymap.m index 02b52813..aaf93989 100644 --- a/xts5/Xproto/pQueryKeymap.m +++ b/xts5/Xproto/pQueryKeymap.m @@ -145,18 +145,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryKeymap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryKeymap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryPointer.m b/xts5/Xproto/pQueryPointer.m index 2f9d5a31..51f44edb 100644 --- a/xts5/Xproto/pQueryPointer.m +++ b/xts5/Xproto/pQueryPointer.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_QueryPointer); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryPointer request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryPointer request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryTextExtents.m b/xts5/Xproto/pQueryTextExtents.m index 932ed816..0d953ea9 100644 --- a/xts5/Xproto/pQueryTextExtents.m +++ b/xts5/Xproto/pQueryTextExtents.m @@ -152,18 +152,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryTextExtents request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryTextExtents request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pQueryTree.m b/xts5/Xproto/pQueryTree.m index bf4b9465..b8449b46 100644 --- a/xts5/Xproto/pQueryTree.m +++ b/xts5/Xproto/pQueryTree.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xResourceReq *) Make_Req(CLIENT, X_QueryTree); @@ -147,18 +147,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent QueryTree request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong QueryTree request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pRecolorCursor.m b/xts5/Xproto/pRecolorCursor.m index ed4740a0..d43514e5 100644 --- a/xts5/Xproto/pRecolorCursor.m +++ b/xts5/Xproto/pRecolorCursor.m @@ -129,9 +129,9 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Cursor_Pixmap(CLIENT); - (void) Create_Default_Cursor(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Cursor_Pixmap(CLIENT); + Create_Default_Cursor(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xRecolorCursorReq *) Make_Req(CLIENT, X_RecolorCursor); @@ -140,18 +140,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default RecolorCursor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent RecolorCursor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong RecolorCursor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pReparentWindow.m b/xts5/Xproto/pReparentWindow.m index c8a1b882..0a53c6e8 100644 --- a/xts5/Xproto/pReparentWindow.m +++ b/xts5/Xproto/pReparentWindow.m @@ -137,7 +137,7 @@ tester() cwr->parent = Default_Window; Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent additional CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Default_Window = cwr->wid; Free_Req(cwr); @@ -148,18 +148,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default ReparentWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent ReparentWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong ReparentWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pRotateProperties.m b/xts5/Xproto/pRotateProperties.m index f20167a7..31de8018 100644 --- a/xts5/Xproto/pRotateProperties.m +++ b/xts5/Xproto/pRotateProperties.m @@ -135,7 +135,7 @@ void tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_prop = Test_prop1; Test_Atom1 = Create_Default_Atom(CLIENT); @@ -159,18 +159,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default RotateProperties request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent RotateProperties request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong RotateProperties request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSendEvent.m b/xts5/Xproto/pSendEvent.m index 0db66b36..0eccffe2 100644 --- a/xts5/Xproto/pSendEvent.m +++ b/xts5/Xproto/pSendEvent.m @@ -146,9 +146,9 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Atom(CLIENT); - (void) Create_Default_Event(CLIENT, ClientMessage); + Create_Default_Window(CLIENT); + Create_Default_Atom(CLIENT); + Create_Default_Event(CLIENT, ClientMessage); Set_Test_Type(CLIENT, test_type); req = (xSendEventReq *) Make_Req(CLIENT, X_SendEvent); @@ -166,18 +166,18 @@ tester() if (!is_fake(ev->u.u.type)) Log_Err("client %d Expected MSB set in event type ClientMessage; got %x\n", ev->u.u.type); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SendEvent request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SendEvent request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetAccessControl.m b/xts5/Xproto/pSetAccessControl.m index 07ef832e..79844704 100644 --- a/xts5/Xproto/pSetAccessControl.m +++ b/xts5/Xproto/pSetAccessControl.m @@ -137,18 +137,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetAccessControl request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetAccessControl request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetAccessControl request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetClipRectangles.m b/xts5/Xproto/pSetClipRectangles.m index ceebb0a5..8ef320cb 100644 --- a/xts5/Xproto/pSetClipRectangles.m +++ b/xts5/Xproto/pSetClipRectangles.m @@ -129,8 +129,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_GContext(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xSetClipRectanglesReq *) Make_Req(CLIENT, X_SetClipRectangles); @@ -139,18 +139,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetClipRectangles request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetClipRectangles request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetClipRectangles request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetCloseDownMode.m b/xts5/Xproto/pSetCloseDownMode.m index 2b4cf8b6..1c5512c7 100644 --- a/xts5/Xproto/pSetCloseDownMode.m +++ b/xts5/Xproto/pSetCloseDownMode.m @@ -137,18 +137,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetCloseDownMode request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetCloseDownMode request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetCloseDownMode request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetDashes.m b/xts5/Xproto/pSetDashes.m index 4160ce01..ec747830 100644 --- a/xts5/Xproto/pSetDashes.m +++ b/xts5/Xproto/pSetDashes.m @@ -129,8 +129,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_GContext(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_GContext(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xSetDashesReq *) Make_Req(CLIENT, X_SetDashes); @@ -139,18 +139,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetDashes request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetDashes request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetDashes request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetFontPath.m b/xts5/Xproto/pSetFontPath.m index c17b5284..e6569473 100644 --- a/xts5/Xproto/pSetFontPath.m +++ b/xts5/Xproto/pSetFontPath.m @@ -136,18 +136,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetFontPath request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetFontPath request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetFontPath request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetInputFocus.m b/xts5/Xproto/pSetInputFocus.m index 93e57b12..fbbca4c8 100644 --- a/xts5/Xproto/pSetInputFocus.m +++ b/xts5/Xproto/pSetInputFocus.m @@ -142,7 +142,7 @@ tester() Log_Trace("client %d received GetInputFocus reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xSetInputFocusReq *) Make_Req(CLIENT, X_SetInputFocus); @@ -153,18 +153,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetInputFocus request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetInputFocus request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetInputFocus request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetModifierMapping.m b/xts5/Xproto/pSetModifierMapping.m index b0f635c3..f76b37ea 100644 --- a/xts5/Xproto/pSetModifierMapping.m +++ b/xts5/Xproto/pSetModifierMapping.m @@ -146,7 +146,7 @@ tester() Log_Trace("client %d received GetModifierMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gmmr); /* ... then make a request to duplicate that mapping. */ @@ -187,18 +187,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetModifierMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetModifierMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetPointerMapping.m b/xts5/Xproto/pSetPointerMapping.m index 936d5695..94634b58 100644 --- a/xts5/Xproto/pSetPointerMapping.m +++ b/xts5/Xproto/pSetPointerMapping.m @@ -144,7 +144,7 @@ tester() Log_Trace("client %d received GetPointerMapping reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xSetPointerMappingReq *) Make_Req(CLIENT, X_SetPointerMapping); @@ -182,18 +182,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetPointerMapping request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetPointerMapping request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetScreenSaver.m b/xts5/Xproto/pSetScreenSaver.m index 16b1feaf..23142f65 100644 --- a/xts5/Xproto/pSetScreenSaver.m +++ b/xts5/Xproto/pSetScreenSaver.m @@ -142,7 +142,7 @@ tester() Log_Trace("client %d received GetScreenSaver reply\n", CLIENT); /* do any reply checking here */ } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Set_Test_Type(CLIENT, test_type); req = (xSetScreenSaverReq *) Make_Req(CLIENT, X_SetScreenSaver); @@ -155,18 +155,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetScreenSaver request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetScreenSaver request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetScreenSaver request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pSetSelectionOwner.m b/xts5/Xproto/pSetSelectionOwner.m index 2ae261d3..52f09dd5 100644 --- a/xts5/Xproto/pSetSelectionOwner.m +++ b/xts5/Xproto/pSetSelectionOwner.m @@ -130,7 +130,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); Test_Property = Create_Default_Atom(CLIENT); Set_Test_Type(CLIENT, test_type); @@ -140,18 +140,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default SetSelectionOwner request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent SetSelectionOwner request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong SetSelectionOwner request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pStoreColors.m b/xts5/Xproto/pStoreColors.m index 86ca6fd3..f6e0db1f 100644 --- a/xts5/Xproto/pStoreColors.m +++ b/xts5/Xproto/pStoreColors.m @@ -156,8 +156,8 @@ tester_rw() Exit_OK(); } - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* allocate a color and store pixel from reply in global */ @@ -177,7 +177,7 @@ tester_rw() Free_Reply(acreply); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); /* store a color in the pixel from the reply */ @@ -187,7 +187,7 @@ tester_rw() Send_Req(CLIENT, (xReq *) req); Set_Test_Type(CLIENT, GOOD); Log_Trace("client %d sent default StoreColors request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); Exit_OK(); @@ -210,8 +210,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* allocate a color and store pixel from reply in global */ @@ -227,7 +227,7 @@ tester() Free_Reply(anreply); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); /* store a color in the pixel from the reply */ @@ -243,19 +243,19 @@ tester() * not the case here, we expect BadAccess error. */ Log_Trace("client %d sent default StoreColors request\n", CLIENT); - (void) Expect_BadAccess(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadAccess(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent StoreColors request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong StoreColors request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pStoreNamedColor.m b/xts5/Xproto/pStoreNamedColor.m index a5b2f151..b03a1401 100644 --- a/xts5/Xproto/pStoreNamedColor.m +++ b/xts5/Xproto/pStoreNamedColor.m @@ -156,8 +156,8 @@ tester_rw() Exit_OK(); } - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* allocate a color and store pixel from reply in global */ @@ -177,7 +177,7 @@ tester_rw() Free_Reply(acreply); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); /* store a color in the pixel from the reply */ @@ -185,7 +185,7 @@ tester_rw() req = (xResourceReq *) Make_Req(CLIENT, X_StoreNamedColor); Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent default StoreNamedColor request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); Exit_OK(); @@ -208,8 +208,8 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* allocate a color and store pixel from reply in global */ @@ -225,7 +225,7 @@ tester() Free_Reply(anreply); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); /* store a color in the pixel from the reply */ @@ -241,19 +241,19 @@ tester() * not the case here, we expect BadAccess error. */ Log_Trace("client %d sent default StoreNamedColor request\n", CLIENT); - (void) Expect_BadAccess(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadAccess(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent StoreNamedColor request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong StoreNamedColor request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pTranslateCoords.m b/xts5/Xproto/pTranslateCoords.m index 36ab9ee3..9b6664bb 100644 --- a/xts5/Xproto/pTranslateCoords.m +++ b/xts5/Xproto/pTranslateCoords.m @@ -132,12 +132,12 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); cwr = (xCreateWindowReq *) Make_Req(CLIENT, X_CreateWindow); Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent default CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Another_Window = cwr->wid; Free_Req(cwr); @@ -157,18 +157,18 @@ tester() /* do any reply checking here */ Free_Reply(rep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent TranslateCoords request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong TranslateCoords request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUngrabButton.m b/xts5/Xproto/pUngrabButton.m index 8518a513..0d47c7a1 100644 --- a/xts5/Xproto/pUngrabButton.m +++ b/xts5/Xproto/pUngrabButton.m @@ -130,12 +130,12 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gbr = (xGrabButtonReq *) Make_Req(CLIENT, X_GrabButton); Send_Req(CLIENT, (xReq *) gbr); Log_Trace("client %d sent default GrabButton request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gbr); Set_Test_Type(CLIENT, test_type); @@ -145,18 +145,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabButton request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabButton request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabButton request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUngrabKey.m b/xts5/Xproto/pUngrabKey.m index 7178d48d..092d46da 100644 --- a/xts5/Xproto/pUngrabKey.m +++ b/xts5/Xproto/pUngrabKey.m @@ -130,12 +130,12 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gkr = (xGrabKeyReq *) Make_Req(CLIENT, X_GrabKey); Send_Req(CLIENT, (xReq *) gkr); Log_Trace("client %d sent default GrabKey request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gkr); Set_Test_Type(CLIENT, test_type); @@ -145,18 +145,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabKey request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabKey request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabKey request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUngrabKeyboard.m b/xts5/Xproto/pUngrabKeyboard.m index cbae1627..4afe526b 100644 --- a/xts5/Xproto/pUngrabKeyboard.m +++ b/xts5/Xproto/pUngrabKeyboard.m @@ -131,7 +131,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gkr = (xGrabKeyboardReq *) Make_Req(CLIENT, X_GrabKeyboard); Send_Req(CLIENT, (xReq *) gkr); @@ -145,7 +145,7 @@ tester() /* do any reply checking here */ Free_Reply(gkrep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gkr); Set_Test_Type(CLIENT, test_type); @@ -155,18 +155,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabKeyboard request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabKeyboard request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabKeyboard request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUngrabPointer.m b/xts5/Xproto/pUngrabPointer.m index 6270ea2e..1c150312 100644 --- a/xts5/Xproto/pUngrabPointer.m +++ b/xts5/Xproto/pUngrabPointer.m @@ -131,7 +131,7 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gpr = (xGrabPointerReq *) Make_Req(CLIENT, X_GrabPointer); Send_Req(CLIENT, (xReq *) gpr); @@ -145,7 +145,7 @@ tester() /* do any reply checking here */ Free_Reply(gprep); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gpr); Set_Test_Type(CLIENT, test_type); @@ -155,18 +155,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabPointer request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabPointer request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabPointer request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUngrabServer.m b/xts5/Xproto/pUngrabServer.m index dc4ee1ff..ec680fcf 100644 --- a/xts5/Xproto/pUngrabServer.m +++ b/xts5/Xproto/pUngrabServer.m @@ -130,12 +130,12 @@ tester() { Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); + Create_Default_Window(CLIENT); gsr = (xReq *) Make_Req(CLIENT, X_GrabServer); Send_Req(CLIENT, (xReq *) gsr); Log_Trace("client %d sent default GrabServer\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(gsr); Set_Test_Type(CLIENT, test_type); @@ -145,18 +145,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UngrabServer request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UngrabServer request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UngrabServer request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUninstallColormap.m b/xts5/Xproto/pUninstallColormap.m index 1663836a..c057da55 100644 --- a/xts5/Xproto/pUninstallColormap.m +++ b/xts5/Xproto/pUninstallColormap.m @@ -143,8 +143,8 @@ tester() Create_Client(CLIENT); - (void) Create_Default_Window(CLIENT); - (void) Create_Default_Colormap(CLIENT); + Create_Default_Window(CLIENT); + Create_Default_Colormap(CLIENT); /* Allocate color cells if client hasn't got any */ @@ -162,12 +162,12 @@ tester() } Free_Req(req); } - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); req = (xResourceReq *) Make_Req(CLIENT, X_InstallColormap); Send_Req(CLIENT, (xReq *) req); Log_Trace("client %d sent default InstallColormap request\n",CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); Set_Test_Type(CLIENT, test_type); @@ -177,18 +177,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UninstallColormap request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UninstallColormap request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UninstallColormap request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUnmapSubwindows.m b/xts5/Xproto/pUnmapSubwindows.m index a480319e..5b08740f 100644 --- a/xts5/Xproto/pUnmapSubwindows.m +++ b/xts5/Xproto/pUnmapSubwindows.m @@ -137,7 +137,7 @@ tester() cwr->parent = Default_Window; Send_Req(CLIENT, (xReq *) cwr); Log_Trace("client %d sent additional CreateWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(cwr); req = (xResourceReq *) Make_Req(CLIENT, X_MapSubwindows); @@ -146,7 +146,7 @@ tester() /* Don't expect to see Expose event because the parent is not mapped. */ - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); Free_Req(req); Set_Test_Type(CLIENT, test_type); @@ -156,18 +156,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UnmapSubwindows request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UnmapSubwindows request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UnmapSubwindows request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pUnmapWindow.m b/xts5/Xproto/pUnmapWindow.m index 8e560e22..3c021dec 100644 --- a/xts5/Xproto/pUnmapWindow.m +++ b/xts5/Xproto/pUnmapWindow.m @@ -140,18 +140,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default UnmapWindow request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent UnmapWindow request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong UnmapWindow request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xproto/pWarpPointer.m b/xts5/Xproto/pWarpPointer.m index b4bce40a..e41e510b 100644 --- a/xts5/Xproto/pWarpPointer.m +++ b/xts5/Xproto/pWarpPointer.m @@ -137,18 +137,18 @@ tester() switch(test_type) { case GOOD: Log_Trace("client %d sent default WarpPointer request\n", CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_Nothing(CLIENT); break; case BAD_LENGTH: Log_Trace("client %d sent WarpPointer request with bad length (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; case TOO_LONG: case JUST_TOO_LONG: Log_Trace("client %d sent overlong WarpPointer request (%d)\n", CLIENT, req->length); - (void) Expect_BadLength(CLIENT); - (void) Expect_Nothing(CLIENT); + Expect_BadLength(CLIENT); + Expect_Nothing(CLIENT); break; default: Log_Err("INTERNAL ERROR: test_type %d not one of GOOD(%d), BAD_LENGTH(%d), TOO_LONG(%d) or JUST_TOO_LONG(%d)\n", diff --git a/xts5/Xt11/XtConvertAndStore.m b/xts5/Xt11/XtConvertAndStore.m index 0363d7b4..1ea5f1f8 100644 --- a/xts5/Xt11/XtConvertAndStore.m +++ b/xts5/Xt11/XtConvertAndStore.m @@ -125,7 +125,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -181,7 +181,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -255,7 +255,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast2", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT2_StringToChar"); @@ -309,7 +309,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -365,7 +365,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -439,7 +439,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast2", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT2_StringToChar"); @@ -492,7 +492,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast2", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT2_StringToChar"); @@ -564,7 +564,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -643,7 +643,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -720,7 +720,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -777,7 +777,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -852,7 +852,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast2", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT2_StringToChar"); @@ -905,7 +905,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast2", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT2_StringToChar"); @@ -975,7 +975,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -1054,7 +1054,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast1", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); @@ -1123,7 +1123,7 @@ pid_t pid2; avs_set_event(1, 0); avs_set_event(2, 0); avs_xt_hier("Tcnvrtast4", "XtConvertAndStore"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Register resource converter XtCVT_StringToChar"); diff --git a/xts5/Xt11/XtCvtIntToBoolean.m b/xts5/Xt11/XtCvtIntToBoolean.m index 8944328c..b71be5cb 100644 --- a/xts5/Xt11/XtCvtIntToBoolean.m +++ b/xts5/Xt11/XtCvtIntToBoolean.m @@ -99,7 +99,7 @@ pid_t pid2; #if XT_X_RELEASE > 4 FORK(pid2); avs_xt_hier("Tcinboln1", "XtCvtIntToBoolean"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("PREP: Get display"); diff --git a/xts5/Xt11/XtCvtIntToDimension.m b/xts5/Xt11/XtCvtIntToDimension.m index 7d3ce7f2..ad7be388 100644 --- a/xts5/Xt11/XtCvtIntToDimension.m +++ b/xts5/Xt11/XtCvtIntToDimension.m @@ -99,7 +99,7 @@ pid_t pid2; #if XT_X_RELEASE > 4 FORK(pid2); avs_xt_hier("Tcinboln1", "XtCvtIntToDimension"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("PREP: Get display"); diff --git a/xts5/Xt11/XtCvtIntToPosition.m b/xts5/Xt11/XtCvtIntToPosition.m index 74068f06..cb951210 100644 --- a/xts5/Xt11/XtCvtIntToPosition.m +++ b/xts5/Xt11/XtCvtIntToPosition.m @@ -99,7 +99,7 @@ pid_t pid2; #if XT_X_RELEASE > 4 FORK(pid2); avs_xt_hier("Tcinboln1", "XtCvtIntToPosition"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("PREP: Get display"); diff --git a/xts5/Xt11/XtCvtIntToShort.m b/xts5/Xt11/XtCvtIntToShort.m index cb4c5235..6877f63d 100644 --- a/xts5/Xt11/XtCvtIntToShort.m +++ b/xts5/Xt11/XtCvtIntToShort.m @@ -99,7 +99,7 @@ pid_t pid2; #if XT_X_RELEASE > 4 FORK(pid2); avs_xt_hier("Tcinboln1", "XtCvtIntToShort"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("PREP: Get display"); diff --git a/xts5/Xt12/XtRegisterGrabAction.m b/xts5/Xt12/XtRegisterGrabAction.m index 5bd0d776..c1b9a938 100644 --- a/xts5/Xt12/XtRegisterGrabAction.m +++ b/xts5/Xt12/XtRegisterGrabAction.m @@ -206,7 +206,7 @@ static XtActionsRec actions[] = { tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); sprintf(ebuf, "PREP: Create label in boxw1 widget"); tet_infoline(ebuf); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); diff --git a/xts5/Xt13/XtAppErrorMsg.m b/xts5/Xt13/XtAppErrorMsg.m index 5460704c..ee3d06b2 100644 --- a/xts5/Xt13/XtAppErrorMsg.m +++ b/xts5/Xt13/XtAppErrorMsg.m @@ -236,7 +236,7 @@ char *ErrorString = "Testing XtErrorMsg aptest"; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set the height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); strcpy(file_name, "/tmp/"); @@ -342,7 +342,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set the height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("PREP: Get the file name to store the error message"); diff --git a/xts5/Xt13/XtResolvePathname/XtResolvePathname.m b/xts5/Xt13/XtResolvePathname/XtResolvePathname.m index 5f2ea6b3..4f1f9251 100644 --- a/xts5/Xt13/XtResolvePathname/XtResolvePathname.m +++ b/xts5/Xt13/XtResolvePathname/XtResolvePathname.m @@ -458,7 +458,7 @@ char *contents = "ApTest.customization:CUSTOM"; trace("Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); trace("Set the height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); } >>SET tpstartup avs_alloc_sem >>SET tpcleanup avs_free_sem diff --git a/xts5/Xt4/XtCreateWidget.m b/xts5/Xt4/XtCreateWidget.m index 7727dbf3..97d19b7f 100644 --- a/xts5/Xt4/XtCreateWidget.m +++ b/xts5/Xt4/XtCreateWidget.m @@ -728,7 +728,7 @@ Widget rowcolw_good; avs_xt_hier("Tcrtwdgt1", "XtCreateWidget"); tet_infoline("PREP: Create rowcolw_good widget in box1w widget"); rowcolw_good = (Widget) CreateRowColWidget(boxw1); - (void) CreateLabelWidget("Failsafe widget", rowcolw_good); + CreateLabelWidget("Failsafe widget", rowcolw_good); tet_infoline("TEST: Create label widget Hello"); labelw_good = XtCreateWidget( "Hello", @@ -866,7 +866,7 @@ Widget widget_good; avs_xt_hier("Tcrtwdgt3", "XtCreateWidget"); tet_infoline("TEST: Create formw_good widget subclass of constraintWidgetClass"); formw_good = (Widget) CreateFormWidget(boxw1); - (void) CreateLabelWidget("failsafe widget", formw_good); + CreateLabelWidget("failsafe widget", formw_good); tet_infoline("PREP: Create labelw_good widget Hello"); setargs[0].name = XtNresizable; setargs[0].value = (XtArgVal) TRUE; @@ -887,7 +887,7 @@ Widget widget_good; avs_xt_hier("Tcrtwdgt4", "XtCreateWidget"); tet_infoline("PREP: Create formw_good widget subclass of constraintWidgetClass"); formw_good = (Widget) CreateFormWidget(boxw1); - (void) CreateLabelWidget("Failsafe widget", formw_good); + CreateLabelWidget("Failsafe widget", formw_good); tet_infoline("TEST: Create labelw_good widget Hello"); labelw_good = XtCreateWidget( "Hello", diff --git a/xts5/Xt5/XtManageChild.m b/xts5/Xt5/XtManageChild.m index c816d077..cfc1c133 100644 --- a/xts5/Xt5/XtManageChild.m +++ b/xts5/Xt5/XtManageChild.m @@ -131,8 +131,8 @@ int invoked; labelw_good, NULL ); - (void) ConfigureDimension(topLevel, labelw_good); - (void) ConfigureDimension(topLevel, labelw_good2); + ConfigureDimension(topLevel, labelw_good); + ConfigureDimension(topLevel, labelw_good2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Manage a widget with non-composite parent"); diff --git a/xts5/Xt5/XtManageChildren.m b/xts5/Xt5/XtManageChildren.m index e2655a3d..74211820 100644 --- a/xts5/Xt5/XtManageChildren.m +++ b/xts5/Xt5/XtManageChildren.m @@ -197,8 +197,8 @@ pid_t pid2; labelw_good, NULL ); - (void) ConfigureDimension(topLevel, labelw_good); - (void) ConfigureDimension(topLevel, labelw_good2); + ConfigureDimension(topLevel, labelw_good); + ConfigureDimension(topLevel, labelw_good2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Manage a widget with a non-composite parent"); diff --git a/xts5/Xt5/XtVaCreateManagedWidget.m b/xts5/Xt5/XtVaCreateManagedWidget.m index e737fd77..2b0c3c4f 100644 --- a/xts5/Xt5/XtVaCreateManagedWidget.m +++ b/xts5/Xt5/XtVaCreateManagedWidget.m @@ -966,7 +966,7 @@ int invoked; boxw1, NULL ); - (void) ConfigureDimension(topLevel, labelw_good); + ConfigureDimension(topLevel, labelw_good); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); tet_infoline("TEST: Create a widget with non-composite parent"); diff --git a/xts5/Xt7/XtMenuPopdown.m b/xts5/Xt7/XtMenuPopdown.m index 35baebbd..511e642a 100644 --- a/xts5/Xt7/XtMenuPopdown.m +++ b/xts5/Xt7/XtMenuPopdown.m @@ -369,11 +369,11 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = (Widget) XtCreateWidget("test2", compositeWidgetClass, test_w, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); test3_w = CreateRowColWidget(test2_w); - (void) ConfigureDimension(topLevel, test3_w); + ConfigureDimension(topLevel, test3_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -420,11 +420,11 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = (Widget) XtCreateWidget("test2", compositeWidgetClass, test_w, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); test3_w = CreateRowColWidget(test2_w); - (void) ConfigureDimension(topLevel, test3_w); + ConfigureDimension(topLevel, test3_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -526,9 +526,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -573,9 +573,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -629,9 +629,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -676,9 +676,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -728,9 +728,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -779,11 +779,11 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = (Widget) XtCreateWidget("test2", compositeWidgetClass, test_w, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); test3_w = CreateRowColWidget(test2_w); - (void) ConfigureDimension(topLevel, test3_w); + ConfigureDimension(topLevel, test3_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); diff --git a/xts5/Xt7/XtMenuPopup.m b/xts5/Xt7/XtMenuPopup.m index 10e1411e..8f146695 100644 --- a/xts5/Xt7/XtMenuPopup.m +++ b/xts5/Xt7/XtMenuPopup.m @@ -448,9 +448,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -744,9 +744,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -795,9 +795,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -838,9 +838,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -881,9 +881,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -926,9 +926,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -975,9 +975,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1026,9 +1026,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1069,9 +1069,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1112,9 +1112,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1157,9 +1157,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1206,9 +1206,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1257,9 +1257,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1300,9 +1300,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1343,9 +1343,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); @@ -1388,9 +1388,9 @@ static char trans_good[] = "#replace \n\ display = XtDisplay(topLevel); tet_infoline("PREP: Create a popup shell"); test_w = (Widget) XtCreateWidget("test", compositeWidgetClass, boxw1, (ArgList)NULL, 0); - (void) ConfigureDimension(topLevel, test_w); + ConfigureDimension(topLevel, test_w); test2_w = CreateRowColWidget(test_w); - (void) ConfigureDimension(topLevel, test2_w); + ConfigureDimension(topLevel, test2_w); menuw = (ShellWidget)XtVaCreatePopupShell("menuw", overrideShellWidgetClass, test_w, NULL); diff --git a/xts5/Xt8/XtMakeGeometryRequest.m b/xts5/Xt8/XtMakeGeometryRequest.m index 0e225b6d..41d66954 100644 --- a/xts5/Xt8/XtMakeGeometryRequest.m +++ b/xts5/Xt8/XtMakeGeometryRequest.m @@ -220,8 +220,8 @@ int invoked; labelw_good, NULL ); - (void) ConfigureDimension(topLevel, labelw_good); - (void) ConfigureDimension(topLevel, labelw_good2); + ConfigureDimension(topLevel, labelw_good); + ConfigureDimension(topLevel, labelw_good2); tet_infoline("TEST: Call XtMakeGeometryRequest"); result = XtMakeGeometryRequest(labelw_good2, &request, &reply_return); LKROF(pid2, AVSXTTIMEOUT-2); diff --git a/xts5/Xt8/XtMakeResizeRequest.m b/xts5/Xt8/XtMakeResizeRequest.m index dbb8f92f..fde80ef9 100644 --- a/xts5/Xt8/XtMakeResizeRequest.m +++ b/xts5/Xt8/XtMakeResizeRequest.m @@ -242,8 +242,8 @@ int invoked; labelw_good, NULL ); - (void) ConfigureDimension(topLevel, labelw_good); - (void) ConfigureDimension(topLevel, labelw_good2); + ConfigureDimension(topLevel, labelw_good); + ConfigureDimension(topLevel, labelw_good2); tet_infoline("TEST: Call XtMakeResizeRequest"); result = XtMakeResizeRequest(labelw_good2, width, height, &width_return, &height_return); LKROF(pid2, AVSXTTIMEOUT-2); diff --git a/xts5/Xt8/XtResizeWindow.m b/xts5/Xt8/XtResizeWindow.m index 114af098..09d33047 100644 --- a/xts5/Xt8/XtResizeWindow.m +++ b/xts5/Xt8/XtResizeWindow.m @@ -743,7 +743,7 @@ pid_t pid2; FORK(pid2); avs_xt_hier("Trszwindw2", "XtResizeWindow"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Invoke Realize and create widget's working window"); squarew = XtVaCreateManagedWidget("squarew", squareCellWidgetClass, boxw1, NULL); diff --git a/xts5/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m b/xts5/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m index 0a44ff62..c720da1a 100644 --- a/xts5/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m +++ b/xts5/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m @@ -723,7 +723,7 @@ pid_t pid2; FORK(pid2); avs_xt_hier("Tcalafocs1", "XtCallAcceptFocus"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create Square Cell widget"); squarew = XtVaCreateManagedWidget("squarew", squareCellWidgetClass, boxw1, NULL); diff --git a/xts5/Xt9/XtGrabButton.m b/xts5/Xt9/XtGrabButton.m index 2faad1bb..1bc0ea7d 100644 --- a/xts5/Xt9/XtGrabButton.m +++ b/xts5/Xt9/XtGrabButton.m @@ -185,7 +185,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); sprintf(ebuf, "PREP: Create label requesting user input"); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); @@ -235,7 +235,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); sprintf(ebuf, "PREP: Create label requesting user input"); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); XtAppAddTimeOut(app_ctext, (unsigned long)500, XtTMO_Proc, topLevel); @@ -289,7 +289,7 @@ if (config.coverage < 2) { tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); sprintf(ebuf, "PREP: Create label requesting user input"); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); XtAppAddTimeOut(app_ctext, (unsigned long)500, XtTMO_Proc, topLevel); diff --git a/xts5/Xt9/XtGrabKey.m b/xts5/Xt9/XtGrabKey.m index f9b75dc8..7f208803 100644 --- a/xts5/Xt9/XtGrabKey.m +++ b/xts5/Xt9/XtGrabKey.m @@ -208,7 +208,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); @@ -258,7 +258,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Establish passive grab with XtGrabKey"); XtGrabKey(labelw_msg, AnyKey, AnyModifier, FALSE, GrabModeAsync, GrabModeAsync); @@ -308,7 +308,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); diff --git a/xts5/Xt9/XtGrabKeyboard.m b/xts5/Xt9/XtGrabKeyboard.m index b3774406..3c8bb953 100644 --- a/xts5/Xt9/XtGrabKeyboard.m +++ b/xts5/Xt9/XtGrabKeyboard.m @@ -211,7 +211,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); XtAppAddTimeOut(app_ctext, (unsigned long)5000, XtTMO_Proc, topLevel); @@ -257,7 +257,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("TEST: Grab the keyboard without realizing the widgets"); ret_value = XtGrabKeyboard(labelw, FALSE, GrabModeAsync, GrabModeAsync, CurrentTime); diff --git a/xts5/Xt9/XtSetKeyboardFocus.m b/xts5/Xt9/XtSetKeyboardFocus.m index def760ba..29f6aecf 100644 --- a/xts5/Xt9/XtSetKeyboardFocus.m +++ b/xts5/Xt9/XtSetKeyboardFocus.m @@ -372,10 +372,10 @@ Widget test_widget, test_widget2; avs_xt_hier("Tstkbfocs3", "XtSetKeyboardFocus"); tet_infoline("PREP: Create Core widget as child of rowcolw widget"); test_widget = XtVaCreateManagedWidget("core", coreWidgetClass, rowcolw, NULL); - (void) ConfigureDimension(topLevel, test_widget); + ConfigureDimension(topLevel, test_widget); tet_infoline("PREP: Create rectObj widget as child of core widget"); test_widget2 = XtVaCreateWidget("rect", rectObjClass, test_widget, NULL); - (void) ConfigureDimension(topLevel, test_widget2); + ConfigureDimension(topLevel, test_widget2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); display = XtDisplay(topLevel); @@ -499,7 +499,7 @@ Display *display; FORK(pid2); avs_xt_hier("Tstkbfocs6", "XtSetKeyboardFocus"); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); display = XtDisplay(panedw); diff --git a/xts5/Xt9/XtUngrabButton.m b/xts5/Xt9/XtUngrabButton.m index 07cfa2a3..b1a3f90f 100644 --- a/xts5/Xt9/XtUngrabButton.m +++ b/xts5/Xt9/XtUngrabButton.m @@ -180,7 +180,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); sprintf(ebuf, "PREP: Create label requesting user input"); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); @@ -237,7 +237,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); sprintf(ebuf, "PREP: Create label requesting user input"); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); diff --git a/xts5/Xt9/XtUngrabKey.m b/xts5/Xt9/XtUngrabKey.m index 9f01e8e3..706ee5d3 100644 --- a/xts5/Xt9/XtUngrabKey.m +++ b/xts5/Xt9/XtUngrabKey.m @@ -196,7 +196,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); @@ -254,7 +254,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); diff --git a/xts5/Xt9/XtUngrabKeyboard.m b/xts5/Xt9/XtUngrabKeyboard.m index 7f48f748..398e15c8 100644 --- a/xts5/Xt9/XtUngrabKeyboard.m +++ b/xts5/Xt9/XtUngrabKeyboard.m @@ -177,7 +177,7 @@ pid_t pid2; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); labelw_msg = (Widget) CreateLabelWidget(msg, boxw1); tet_infoline("PREP: Create windows for widgets and map them"); XtRealizeWidget(topLevel); diff --git a/xts5/XtC/XtAddActions.m b/xts5/XtC/XtAddActions.m index 678ea531..118c773c 100644 --- a/xts5/XtC/XtAddActions.m +++ b/xts5/XtC/XtAddActions.m @@ -192,7 +192,7 @@ pid_t pid3; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create AVS Widget"); test_widget = (Widget) CreateLabelWidget(test_text, boxw1); tet_infoline("TEST: Create windows for widgets and map them"); @@ -274,7 +274,7 @@ pid_t pid3; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create AVS Widget"); test_widget = (Widget) CreateLabelWidget(test_text, boxw1); tet_infoline("TEST: Create windows for widgets and map them"); @@ -361,7 +361,7 @@ pid_t pid3; tet_infoline("PREP: Create boxw2 widget in panedw widget"); boxw2 = (Widget) CreateBoxWidget(panedw); tet_infoline("PREP: Set height and width of boxw2 widget"); - (void) ConfigureDimension(topLevel, boxw2); + ConfigureDimension(topLevel, boxw2); tet_infoline("PREP: Create AVS Widget"); test_widget = (Widget) CreateLabelWidget(test_text, boxw1); tet_infoline("TEST: Create windows for widgets and map them"); |