hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues Projects Releases Wiki Activity

Remove unneccesary casts from WriteToClient calls

Browse source 
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>
This commit is contained in:
Alan Coopersmith 2012-05-13 00:03:35 -07:00
commit 789d64e19a
90 changed files with 464 additions and 505 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Xi/chgdctl.c
View file

@ -236,5 +236,5 @@ SRepXChangeDeviceControl(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, (char *) rep);
WriteToClient(client, size, rep);
}

4
Xi/getbmap.c
View file

@ -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);
}

2
Xi/getdctl.c
View file

@ -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);
}
/***********************************************************************

2
Xi/getfctl.c
View file

@ -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);
}
/***********************************************************************

2
Xi/getfocus.c
View file

@ -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);
}

2
Xi/getkmap.c
View file

@ -150,5 +150,5 @@ SRepXGetDeviceKeyMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, (char *) rep);
WriteToClient(client, size, rep);
}

4
Xi/getmmap.c
View file

@ -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);
}

2
Xi/getprop.c
View file

@ -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);
}

2
Xi/getselev.c
View file

@ -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);
}

2
Xi/getvers.c
View file

@ -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);
}

2
Xi/grabdev.c
View file

@ -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);
}

4
Xi/gtmotion.c
View file

@ -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);
}

2
Xi/listdev.c
View file

@ -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);
}

4
Xi/opendev.c
View file

@ -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);
}

2
Xi/queryst.c
View file

@ -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);
}

2
Xi/setbmap.c
View file

@ -134,5 +134,5 @@ SRepXSetDeviceButtonMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, (char *) rep);
WriteToClient(client, size, rep);
}

2
Xi/setdval.c
View file

@ -138,5 +138,5 @@ SRepXSetDeviceValuators(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, (char *) rep);
WriteToClient(client, size, rep);
}

2
Xi/setmmap.c
View file

@ -140,5 +140,5 @@ SRepXSetDeviceModifierMapping(ClientPtr client, int size,
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, (char *) rep);
WriteToClient(client, size, rep);
}

2
Xi/setmode.c
View file

@ -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);
}

2
Xi/xigetclientpointer.c
View file

@ -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);
}

2
Xi/xigrabdev.c
View file

@ -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);
}

4
Xi/xipassivegrab.c
View file

@ -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

8
Xi/xiproperty.c
View file

@ -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);
}

2
Xi/xiquerydevice.c
View file

@ -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);
}
/**

2
Xi/xiquerypointer.c
View file

@ -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);
}

2
Xi/xiqueryversion.c
View file

@ -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);
}

2
Xi/xiselectev.c
View file

@ -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);
}

2
Xi/xisetdevfocus.c
View file

@ -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);
}