|
 |
41197e |
From c9b379ec5a1a34692af06056925bd0fc5f809713 Mon Sep 17 00:00:00 2001
|
|
|
41197e |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
41197e |
Date: Tue, 5 Jul 2022 12:40:47 +1000
|
|
|
41197e |
Subject: [PATCH xserver 1/3] xkb: switch to array index loops to moving
|
|
|
41197e |
pointers
|
|
|
41197e |
|
|
|
41197e |
Most similar loops here use a pointer that advances with each loop
|
|
|
41197e |
iteration, let's do the same here for consistency.
|
|
|
41197e |
|
|
|
41197e |
No functional changes.
|
|
|
41197e |
|
|
|
41197e |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
41197e |
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
41197e |
(cherry picked from commit f1070c01d616c5f21f939d5ebc533738779451ac)
|
|
|
41197e |
---
|
|
|
41197e |
xkb/xkb.c | 20 ++++++++++----------
|
|
|
41197e |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
41197e |
|
|
|
41197e |
diff --git a/xkb/xkb.c b/xkb/xkb.c
|
|
|
41197e |
index d056c698c..684394d77 100644
|
|
|
41197e |
--- a/xkb/xkb.c
|
|
|
41197e |
+++ b/xkb/xkb.c
|
|
|
41197e |
@@ -5372,16 +5372,16 @@ _CheckSetSections(XkbGeometryPtr geom,
|
|
|
41197e |
row->left = rWire->left;
|
|
|
41197e |
row->vertical = rWire->vertical;
|
|
|
41197e |
kWire = (xkbKeyWireDesc *) &rWire[1];
|
|
|
41197e |
- for (k = 0; k < rWire->nKeys; k++) {
|
|
|
41197e |
+ for (k = 0; k < rWire->nKeys; k++, kWire++) {
|
|
|
41197e |
XkbKeyPtr key;
|
|
|
41197e |
|
|
|
41197e |
key = XkbAddGeomKey(row);
|
|
|
41197e |
if (!key)
|
|
|
41197e |
return BadAlloc;
|
|
|
41197e |
- memcpy(key->name.name, kWire[k].name, XkbKeyNameLength);
|
|
|
41197e |
- key->gap = kWire[k].gap;
|
|
|
41197e |
- key->shape_ndx = kWire[k].shapeNdx;
|
|
|
41197e |
- key->color_ndx = kWire[k].colorNdx;
|
|
|
41197e |
+ memcpy(key->name.name, kWire->name, XkbKeyNameLength);
|
|
|
41197e |
+ key->gap = kWire->gap;
|
|
|
41197e |
+ key->shape_ndx = kWire->shapeNdx;
|
|
|
41197e |
+ key->color_ndx = kWire->colorNdx;
|
|
|
41197e |
if (key->shape_ndx >= geom->num_shapes) {
|
|
|
41197e |
client->errorValue = _XkbErrCode3(0x10, key->shape_ndx,
|
|
|
41197e |
geom->num_shapes);
|
|
|
41197e |
@@ -5393,7 +5393,7 @@ _CheckSetSections(XkbGeometryPtr geom,
|
|
|
41197e |
return BadMatch;
|
|
|
41197e |
}
|
|
|
41197e |
}
|
|
|
41197e |
- rWire = (xkbRowWireDesc *) &kWire[rWire->nKeys];
|
|
|
41197e |
+ rWire = (xkbRowWireDesc *)kWire;
|
|
|
41197e |
}
|
|
|
41197e |
wire = (char *) rWire;
|
|
|
41197e |
if (sWire->nDoodads > 0) {
|
|
|
41197e |
@@ -5458,16 +5458,16 @@ _CheckSetShapes(XkbGeometryPtr geom,
|
|
|
41197e |
return BadAlloc;
|
|
|
41197e |
ol->corner_radius = olWire->cornerRadius;
|
|
|
41197e |
ptWire = (xkbPointWireDesc *) &olWire[1];
|
|
|
41197e |
- for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++) {
|
|
|
41197e |
- pt->x = ptWire[p].x;
|
|
|
41197e |
- pt->y = ptWire[p].y;
|
|
|
41197e |
+ for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++, ptWire++) {
|
|
|
41197e |
+ pt->x = ptWire->x;
|
|
|
41197e |
+ pt->y = ptWire->y;
|
|
|
41197e |
if (client->swapped) {
|
|
|
41197e |
swaps(&pt->x);
|
|
|
41197e |
swaps(&pt->y);
|
|
|
41197e |
}
|
|
|
41197e |
}
|
|
|
41197e |
ol->num_points = olWire->nPoints;
|
|
|
41197e |
- olWire = (xkbOutlineWireDesc *) (&ptWire[olWire->nPoints]);
|
|
|
41197e |
+ olWire = (xkbOutlineWireDesc *)ptWire;
|
|
|
41197e |
}
|
|
|
41197e |
if (shapeWire->primaryNdx != XkbNoShape)
|
|
|
41197e |
shape->primary = &shape->outlines[shapeWire->primaryNdx];
|
|
|
41197e |
--
|
|
|
41197e |
2.36.1
|
|
|
41197e |
|