You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
77 lines
3.1 KiB
77 lines
3.1 KiB
From c9b379ec5a1a34692af06056925bd0fc5f809713 Mon Sep 17 00:00:00 2001 |
|
From: Peter Hutterer <peter.hutterer@who-t.net> |
|
Date: Tue, 5 Jul 2022 12:40:47 +1000 |
|
Subject: [PATCH xserver 1/3] 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> |
|
(cherry picked from commit f1070c01d616c5f21f939d5ebc533738779451ac) |
|
--- |
|
xkb/xkb.c | 20 ++++++++++---------- |
|
1 file changed, 10 insertions(+), 10 deletions(-) |
|
|
|
diff --git a/xkb/xkb.c b/xkb/xkb.c |
|
index d056c698c..684394d77 100644 |
|
--- a/xkb/xkb.c |
|
+++ b/xkb/xkb.c |
|
@@ -5372,16 +5372,16 @@ _CheckSetSections(XkbGeometryPtr geom, |
|
row->left = rWire->left; |
|
row->vertical = rWire->vertical; |
|
kWire = (xkbKeyWireDesc *) &rWire[1]; |
|
- for (k = 0; k < rWire->nKeys; k++) { |
|
+ for (k = 0; k < rWire->nKeys; k++, kWire++) { |
|
XkbKeyPtr key; |
|
|
|
key = XkbAddGeomKey(row); |
|
if (!key) |
|
return BadAlloc; |
|
- memcpy(key->name.name, kWire[k].name, XkbKeyNameLength); |
|
- key->gap = kWire[k].gap; |
|
- key->shape_ndx = kWire[k].shapeNdx; |
|
- key->color_ndx = kWire[k].colorNdx; |
|
+ memcpy(key->name.name, kWire->name, XkbKeyNameLength); |
|
+ key->gap = kWire->gap; |
|
+ key->shape_ndx = kWire->shapeNdx; |
|
+ key->color_ndx = kWire->colorNdx; |
|
if (key->shape_ndx >= geom->num_shapes) { |
|
client->errorValue = _XkbErrCode3(0x10, key->shape_ndx, |
|
geom->num_shapes); |
|
@@ -5393,7 +5393,7 @@ _CheckSetSections(XkbGeometryPtr geom, |
|
return BadMatch; |
|
} |
|
} |
|
- rWire = (xkbRowWireDesc *) &kWire[rWire->nKeys]; |
|
+ rWire = (xkbRowWireDesc *)kWire; |
|
} |
|
wire = (char *) rWire; |
|
if (sWire->nDoodads > 0) { |
|
@@ -5458,16 +5458,16 @@ _CheckSetShapes(XkbGeometryPtr geom, |
|
return BadAlloc; |
|
ol->corner_radius = olWire->cornerRadius; |
|
ptWire = (xkbPointWireDesc *) &olWire[1]; |
|
- for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++) { |
|
- pt->x = ptWire[p].x; |
|
- pt->y = ptWire[p].y; |
|
+ for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++, ptWire++) { |
|
+ pt->x = ptWire->x; |
|
+ pt->y = ptWire->y; |
|
if (client->swapped) { |
|
swaps(&pt->x); |
|
swaps(&pt->y); |
|
} |
|
} |
|
ol->num_points = olWire->nPoints; |
|
- olWire = (xkbOutlineWireDesc *) (&ptWire[olWire->nPoints]); |
|
+ olWire = (xkbOutlineWireDesc *)ptWire; |
|
} |
|
if (shapeWire->primaryNdx != XkbNoShape) |
|
shape->primary = &shape->outlines[shapeWire->primaryNdx]; |
|
-- |
|
2.36.1 |
|
|
|
|