Remove superfluous (void) casts.

sed -e "s/\([   ]\)(void) \(.*\)/\1\2/"

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>

36 files changed, 201 insertions, 201 deletions

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",