summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-05-13 00:03:35 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-09 19:12:56 -0700
commit789d64e19a3b3d98b88bc80f677e0c37bfb5c631 (patch)
tree40f01917cef8f4b645bda7f95aa2c769225d2a4a /Xi
parent329db3292223cccd4887062956622285c45a1523 (diff)
Remove unneccesary casts from WriteToClient calls
Casting return to (void) was used to tell lint that you intended to ignore the return value, so it didn't warn you about it. Casting the third argument to (char *) was used as the most generic pointer type in the days before compilers supported C89 (void *) (except for a couple places it's used for byte-sized pointer math). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Tested-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/chgdctl.c2
-rw-r--r--Xi/getbmap.c4
-rw-r--r--Xi/getdctl.c2
-rw-r--r--Xi/getfctl.c2
-rw-r--r--Xi/getfocus.c2
-rw-r--r--Xi/getkmap.c2
-rw-r--r--Xi/getmmap.c4
-rw-r--r--Xi/getprop.c2
-rw-r--r--Xi/getselev.c2
-rw-r--r--Xi/getvers.c2
-rw-r--r--Xi/grabdev.c2
-rw-r--r--Xi/gtmotion.c4
-rw-r--r--Xi/listdev.c2
-rw-r--r--Xi/opendev.c4
-rw-r--r--Xi/queryst.c2
-rw-r--r--Xi/setbmap.c2
-rw-r--r--Xi/setdval.c2
-rw-r--r--Xi/setmmap.c2
-rw-r--r--Xi/setmode.c2
-rw-r--r--Xi/xigetclientpointer.c2
-rw-r--r--Xi/xigrabdev.c2
-rw-r--r--Xi/xipassivegrab.c4
-rw-r--r--Xi/xiproperty.c8
-rw-r--r--Xi/xiquerydevice.c2
-rw-r--r--Xi/xiquerypointer.c2
-rw-r--r--Xi/xiqueryversion.c2
-rw-r--r--Xi/xiselectev.c2
-rw-r--r--Xi/xisetdevfocus.c2
28 files changed, 36 insertions, 36 deletions
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index ff5d69aef..0de5f2b59 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -236,5 +236,5 @@ SRepXChangeDeviceControl(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index a0ec1a61b..2712fcdbc 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -109,7 +109,7 @@ ProcXGetDeviceButtonMapping(ClientPtr client)
rep.nElts = b->numButtons;
rep.length = bytes_to_int32(rep.nElts);
WriteReplyToClient(client, sizeof(xGetDeviceButtonMappingReply), &rep);
- (void) WriteToClient(client, rep.nElts, (char *) &b->map[1]);
+ WriteToClient(client, rep.nElts, &b->map[1]);
return Success;
}
@@ -126,5 +126,5 @@ SRepXGetDeviceButtonMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 4d66a4dfc..27775e24d 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -158,7 +158,7 @@ SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
/***********************************************************************
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 2772c0c26..5f97cc3a9 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -265,7 +265,7 @@ SRepXGetFeedbackControl(ClientPtr client, int size,
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->num_feedbacks);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
/***********************************************************************
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index ba36e37e3..54c176fa2 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -135,5 +135,5 @@ SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep)
swapl(&rep->length);
swapl(&rep->focus);
swapl(&rep->time);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 006be62a6..353687947 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -150,5 +150,5 @@ SRepXGetDeviceKeyMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 3f8424373..97d4c0d87 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -109,7 +109,7 @@ ProcXGetDeviceModifierMapping(ClientPtr client)
rep.length = max_keys_per_mod << 1;
WriteReplyToClient(client, sizeof(xGetDeviceModifierMappingReply), &rep);
- WriteToClient(client, max_keys_per_mod * 8, (char *) modkeymap);
+ WriteToClient(client, max_keys_per_mod * 8, modkeymap);
free(modkeymap);
@@ -129,5 +129,5 @@ SRepXGetDeviceModifierMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getprop.c b/Xi/getprop.c
index b7b9e6b5a..b5af13a62 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -178,5 +178,5 @@ SRepXGetDeviceDontPropagateList(ClientPtr client, int size,
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->count);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 253c87fb5..4fcc902ee 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -170,5 +170,5 @@ SRepXGetSelectedExtensionEvents(ClientPtr client, int size,
swapl(&rep->length);
swaps(&rep->this_client_count);
swaps(&rep->all_clients_count);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/getvers.c b/Xi/getvers.c
index eb52c5b93..b380344a4 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -127,5 +127,5 @@ SRepXGetExtensionVersion(ClientPtr client, int size,
swapl(&rep->length);
swaps(&rep->major_version);
swaps(&rep->minor_version);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index c904a9707..bdc0c4bcd 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -211,5 +211,5 @@ SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 48bc79af4..2249b86d7 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -147,7 +147,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
bufptr++;
}
}
- WriteToClient(client, length * 4, (char *) coords);
+ WriteToClient(client, length * 4, coords);
}
free(coords);
return Success;
@@ -167,5 +167,5 @@ SRepXGetDeviceMotionEvents(ClientPtr client, int size,
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swapl(&rep->nEvents);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/listdev.c b/Xi/listdev.c
index a02112f32..1fff73804 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -417,5 +417,5 @@ SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/opendev.c b/Xi/opendev.c
index e7c00a236..486ac143a 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -151,7 +151,7 @@ ProcXOpenDevice(ClientPtr client)
rep.length = bytes_to_int32(j * sizeof(xInputClassInfo));
rep.num_classes = j;
WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep);
- WriteToClient(client, j * sizeof(xInputClassInfo), (char *) evbase);
+ WriteToClient(client, j * sizeof(xInputClassInfo), evbase);
return Success;
}
@@ -167,5 +167,5 @@ SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/queryst.c b/Xi/queryst.c
index ffb6de04a..de199743c 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -184,5 +184,5 @@ SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 110f5e91e..296b43917 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -134,5 +134,5 @@ SRepXSetDeviceButtonMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 542f20dd8..8c3816de7 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -138,5 +138,5 @@ SRepXSetDeviceValuators(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 36845d706..e70038ee3 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -140,5 +140,5 @@ SRepXSetDeviceModifierMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/setmode.c b/Xi/setmode.c
index a7bf1eaff..f212d8395 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -137,5 +137,5 @@ SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c
index 07dbf1800..8a5f54f9e 100644
--- a/Xi/xigetclientpointer.c
+++ b/Xi/xigetclientpointer.c
@@ -100,5 +100,5 @@ SRepXIGetClientPointer(ClientPtr client, int size,
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->deviceid);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c
index 8d2cf0bed..095fcfa63 100644
--- a/Xi/xigrabdev.c
+++ b/Xi/xigrabdev.c
@@ -156,5 +156,5 @@ SRepXIGrabDevice(ClientPtr client, int size, xXIGrabDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 7130328ec..5e4fa4e60 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -224,7 +224,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
WriteReplyToClient(client, sizeof(rep), &rep);
if (rep.num_modifiers)
- WriteToClient(client, rep.length * 4, (char *) modifiers_failed);
+ WriteToClient(client, rep.length * 4, modifiers_failed);
free(modifiers_failed);
out:
@@ -240,7 +240,7 @@ SRepXIPassiveGrabDevice(ClientPtr client, int size,
swapl(&rep->length);
swaps(&rep->num_modifiers);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
int
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 5f46b5435..ab8696365 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -1063,7 +1063,7 @@ SRepXListDeviceProperties(ClientPtr client, int size,
swapl(&rep->length);
swaps(&rep->nAtoms);
/* properties will be swapped later, see ProcXListDeviceProperties */
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
void
@@ -1076,7 +1076,7 @@ SRepXGetDeviceProperty(ClientPtr client, int size,
swapl(&rep->bytesAfter);
swapl(&rep->nItems);
/* data will be swapped, see ProcXGetDeviceProperty */
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
/* XI2 Request/reply handling */
@@ -1300,7 +1300,7 @@ SRepXIListProperties(ClientPtr client, int size, xXIListPropertiesReply * rep)
swapl(&rep->length);
swaps(&rep->num_properties);
/* properties will be swapped later, see ProcXIListProperties */
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
void
@@ -1312,5 +1312,5 @@ SRepXIGetProperty(ClientPtr client, int size, xXIGetPropertyReply * rep)
swapl(&rep->bytes_after);
swapl(&rep->num_items);
/* data will be swapped, see ProcXIGetProperty */
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index 15c8b2a7b..af7ea5394 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -162,7 +162,7 @@ SRepXIQueryDevice(ClientPtr client, int size, xXIQueryDeviceReply * rep)
/* Device info is already swapped, see ProcXIQueryDevice */
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
/**
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 169436e14..e09a1f694 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -219,5 +219,5 @@ SRepXIQueryPointer(ClientPtr client, int size, xXIQueryPointerReply * rep)
swapl(&rep->win_y);
swaps(&rep->buttons_len);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c
index 6081c413d..0d4962f10 100644
--- a/Xi/xiqueryversion.c
+++ b/Xi/xiqueryversion.c
@@ -126,5 +126,5 @@ SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply * rep)
swapl(&rep->length);
swaps(&rep->major_version);
swaps(&rep->minor_version);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index e7e719d16..6dd2c1cac 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -335,5 +335,5 @@ SRepXIGetSelectedEvents(ClientPtr client,
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->num_masks);
- WriteToClient(client, len, (char *) rep);
+ WriteToClient(client, len, rep);
}
diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c
index b52c9cc99..55e5c3560 100644
--- a/Xi/xisetdevfocus.c
+++ b/Xi/xisetdevfocus.c
@@ -121,5 +121,5 @@ SRepXIGetFocus(ClientPtr client, int len, xXIGetFocusReply * rep)
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swapl(&rep->focus);
- WriteToClient(client, len, (char *) rep);
+ WriteToClient(client, len, rep);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 04:22:39 +0000