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

xkb: switch to array index loops to moving pointers 

Most similar loops here use a pointer that advances with each loop
iteration, let's do the same here for consistency.

No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Peter Hutterer 2022-07-05 12:40:47 +10:00 committed by Olivier Fourdan
parent 6f234c60d9
commit f1070c01d6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xkb/xkb.c
View File

@ -5368,16 +5368,16 @@ _CheckSetSections(XkbGeometryPtr geom,
row->left = rWire->left; row->left = rWire->left;
row->vertical = rWire->vertical; row->vertical = rWire->vertical;
kWire = (xkbKeyWireDesc *) &rWire[1]; kWire = (xkbKeyWireDesc *) &rWire[1];
for (k = 0; k < rWire->nKeys; k++) { for (k = 0; k < rWire->nKeys; k++, kWire++) {
XkbKeyPtr key; XkbKeyPtr key;
key = XkbAddGeomKey(row); key = XkbAddGeomKey(row);
if (!key) if (!key)
return BadAlloc; return BadAlloc;
memcpy(key->name.name, kWire[k].name, XkbKeyNameLength); memcpy(key->name.name, kWire->name, XkbKeyNameLength);
key->gap = kWire[k].gap; key->gap = kWire->gap;
key->shape_ndx = kWire[k].shapeNdx; key->shape_ndx = kWire->shapeNdx;
key->color_ndx = kWire[k].colorNdx; key->color_ndx = kWire->colorNdx;
if (key->shape_ndx >= geom->num_shapes) { if (key->shape_ndx >= geom->num_shapes) {
client->errorValue = _XkbErrCode3(0x10, key->shape_ndx, client->errorValue = _XkbErrCode3(0x10, key->shape_ndx,
geom->num_shapes); geom->num_shapes);
@ -5389,7 +5389,7 @@ _CheckSetSections(XkbGeometryPtr geom,
return BadMatch; return BadMatch;
} }
} }
rWire = (xkbRowWireDesc *) &kWire[rWire->nKeys]; rWire = (xkbRowWireDesc *)kWire;
} }
wire = (char *) rWire; wire = (char *) rWire;
if (sWire->nDoodads > 0) { if (sWire->nDoodads > 0) {
@ -5454,16 +5454,16 @@ _CheckSetShapes(XkbGeometryPtr geom,
return BadAlloc; return BadAlloc;
ol->corner_radius = olWire->cornerRadius; ol->corner_radius = olWire->cornerRadius;
ptWire = (xkbPointWireDesc *) &olWire[1]; ptWire = (xkbPointWireDesc *) &olWire[1];
for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++) { for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++, ptWire++) {
pt->x = ptWire[p].x; pt->x = ptWire->x;
pt->y = ptWire[p].y; pt->y = ptWire->y;
if (client->swapped) { if (client->swapped) {
swaps(&pt->x); swaps(&pt->x);
swaps(&pt->y); swaps(&pt->y);
} }
} }
ol->num_points = olWire->nPoints; ol->num_points = olWire->nPoints;
olWire = (xkbOutlineWireDesc *) (&ptWire[olWire->nPoints]); olWire = (xkbOutlineWireDesc *)ptWire;
} }
if (shapeWire->primaryNdx != XkbNoShape) if (shapeWire->primaryNdx != XkbNoShape)
shape->primary = &shape->outlines[shapeWire->primaryNdx]; shape->primary = &shape->outlines[shapeWire->primaryNdx];