Commit 54770c98 authored by Matt Turner's avatar Matt Turner

Cast char* buffers to swap functions

Reviewed-by: 's avatarPeter Harris <pharris@opentext.com>
Signed-off-by: 's avatarMatt Turner <mattst88@gmail.com>
parent 9edcae78
......@@ -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;
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment