Cast char* buffers to swap functions
Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
9edcae78c4
commit
54770c980c
|
@ -397,9 +397,9 @@ SwapFont(xQueryFontReply *pr, Bool hasGlyphs)
|
|||
* they are always 2 4 byte values */
|
||||
for(i = 0; i < nprops; i++)
|
||||
{
|
||||
swapl(pby);
|
||||
swapl((int *)pby);
|
||||
pby += 4;
|
||||
swapl(pby);
|
||||
swapl((int *)pby);
|
||||
pby += 4;
|
||||
}
|
||||
if (hasGlyphs)
|
||||
|
|
|
@ -2375,7 +2375,7 @@ SProcRenderCompositeGlyphs (ClientPtr client)
|
|||
i = elt->len;
|
||||
if (i == 0xff)
|
||||
{
|
||||
swapl(buffer);
|
||||
swapl((int *)buffer);
|
||||
buffer += 4;
|
||||
}
|
||||
else
|
||||
|
@ -2388,14 +2388,14 @@ SProcRenderCompositeGlyphs (ClientPtr client)
|
|||
case 2:
|
||||
while (i--)
|
||||
{
|
||||
swaps(buffer);
|
||||
swaps((short *)buffer);
|
||||
buffer += 2;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
while (i--)
|
||||
{
|
||||
swapl(buffer);
|
||||
swapl((int *)buffer);
|
||||
buffer += 4;
|
||||
}
|
||||
break;
|
||||
|
|
12
xkb/xkb.c
12
xkb/xkb.c
|
@ -1109,7 +1109,7 @@ register unsigned i;
|
|||
register int nSyms= outMap->nSyms;
|
||||
swaps(&outMap->nSyms);
|
||||
while (nSyms-->0) {
|
||||
swapl(buf);
|
||||
swapl((int *)buf);
|
||||
buf+= 4;
|
||||
}
|
||||
}
|
||||
|
@ -3646,21 +3646,21 @@ char * desc;
|
|||
if (which&XkbKeycodesNameMask) {
|
||||
*((CARD32 *)desc)= xkb->names->keycodes;
|
||||
if (client->swapped) {
|
||||
swapl(desc);
|
||||
swapl((int *)desc);
|
||||
}
|
||||
desc+= 4;
|
||||
}
|
||||
if (which&XkbGeometryNameMask) {
|
||||
*((CARD32 *)desc)= xkb->names->geometry;
|
||||
if (client->swapped) {
|
||||
swapl(desc);
|
||||
swapl((int *)desc);
|
||||
}
|
||||
desc+= 4;
|
||||
}
|
||||
if (which&XkbSymbolsNameMask) {
|
||||
*((CARD32 *)desc)= xkb->names->symbols;
|
||||
if (client->swapped) {
|
||||
swapl(desc);
|
||||
swapl((int *)desc);
|
||||
}
|
||||
desc+= 4;
|
||||
}
|
||||
|
@ -3675,14 +3675,14 @@ char * desc;
|
|||
if (which&XkbTypesNameMask) {
|
||||
*((CARD32 *)desc)= (CARD32)xkb->names->types;
|
||||
if (client->swapped) {
|
||||
swapl(desc);
|
||||
swapl((int *)desc);
|
||||
}
|
||||
desc+= 4;
|
||||
}
|
||||
if (which&XkbCompatNameMask) {
|
||||
*((CARD32 *)desc)= (CARD32)xkb->names->compat;
|
||||
if (client->swapped) {
|
||||
swapl(desc);
|
||||
swapl((int *)desc);
|
||||
}
|
||||
desc+= 4;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user