frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Matt Turner 2011-08-16 16:59:07 -04:00
parent 9edcae78c4
commit 54770c980c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/swaprep.c
View File

@ -397,9 +397,9 @@ SwapFont(xQueryFontReply *pr, Bool hasGlyphs)
* they are always 2 4 byte values */ * they are always 2 4 byte values */
for(i = 0; i < nprops; i++) for(i = 0; i < nprops; i++)
{ {
swapl(pby); swapl((int *)pby);
pby += 4; pby += 4;
swapl(pby); swapl((int *)pby);
pby += 4; pby += 4;
} }
if (hasGlyphs) if (hasGlyphs)

6
render/render.c
View File

@ -2375,7 +2375,7 @@ SProcRenderCompositeGlyphs (ClientPtr client)
i = elt->len; i = elt->len;
if (i == 0xff) if (i == 0xff)
{ {
swapl(buffer); swapl((int *)buffer);
buffer += 4; buffer += 4;
} }
else else
@ -2388,14 +2388,14 @@ SProcRenderCompositeGlyphs (ClientPtr client)
case 2: case 2:
while (i--) while (i--)
{ {
swaps(buffer); swaps((short *)buffer);
buffer += 2; buffer += 2;
} }
break; break;
case 4: case 4:
while (i--) while (i--)
{ {
swapl(buffer); swapl((int *)buffer);
buffer += 4; buffer += 4;
} }
break; break;

12
xkb/xkb.c
View File

@ -1109,7 +1109,7 @@ register unsigned i;
register int nSyms= outMap->nSyms; register int nSyms= outMap->nSyms;
swaps(&outMap->nSyms); swaps(&outMap->nSyms);
while (nSyms-->0) { while (nSyms-->0) {
swapl(buf); swapl((int *)buf);
buf+= 4; buf+= 4;
} }
} }
@ -3646,21 +3646,21 @@ char * desc;
if (which&XkbKeycodesNameMask) { if (which&XkbKeycodesNameMask) {
*((CARD32 *)desc)= xkb->names->keycodes; *((CARD32 *)desc)= xkb->names->keycodes;
if (client->swapped) { if (client->swapped) {
swapl(desc); swapl((int *)desc);
} }
desc+= 4; desc+= 4;
} }
if (which&XkbGeometryNameMask) { if (which&XkbGeometryNameMask) {
*((CARD32 *)desc)= xkb->names->geometry; *((CARD32 *)desc)= xkb->names->geometry;
if (client->swapped) { if (client->swapped) {
swapl(desc); swapl((int *)desc);
} }
desc+= 4; desc+= 4;
} }
if (which&XkbSymbolsNameMask) { if (which&XkbSymbolsNameMask) {
*((CARD32 *)desc)= xkb->names->symbols; *((CARD32 *)desc)= xkb->names->symbols;
if (client->swapped) { if (client->swapped) {
swapl(desc); swapl((int *)desc);
} }
desc+= 4; desc+= 4;
} }
@ -3675,14 +3675,14 @@ char * desc;
if (which&XkbTypesNameMask) { if (which&XkbTypesNameMask) {
*((CARD32 *)desc)= (CARD32)xkb->names->types; *((CARD32 *)desc)= (CARD32)xkb->names->types;
if (client->swapped) { if (client->swapped) {
swapl(desc); swapl((int *)desc);
} }
desc+= 4; desc+= 4;
} }
if (which&XkbCompatNameMask) { if (which&XkbCompatNameMask) {
*((CARD32 *)desc)= (CARD32)xkb->names->compat; *((CARD32 *)desc)= (CARD32)xkb->names->compat;
if (client->swapped) { if (client->swapped) {
swapl(desc); swapl((int *)desc);
} }
desc+= 4; desc+= 4;
} }