diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-08-16 18:27:28 -0700 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:28 +0200 |
| commit | 2824899d280f2b169b3e745b222f9a981c1ce5f7 (patch) | |
| tree | b36bb27f59fc802561e78aa344755808b71a0279 /nx-X11/lib/X11/XKBSetMap.c | |
| parent | 3c5880e7254dcd04ea8e54d53ec99880e2dfdc27 (diff) | |
| download | nx-libs-2824899d280f2b169b3e745b222f9a981c1ce5f7.tar.gz nx-libs-2824899d280f2b169b3e745b222f9a981c1ce5f7.tar.bz2 nx-libs-2824899d280f2b169b3e745b222f9a981c1ce5f7.zip | |
Rearrange some variable declarations & initializations in XKB
Little things noticed during XKB restyling that seemed to make the
code easier to read.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/XKBSetMap.c')
| -rw-r--r-- | nx-X11/lib/X11/XKBSetMap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/XKBSetMap.c b/nx-X11/lib/X11/XKBSetMap.c index dbf1a8a96..cb696105c 100644 --- a/nx-X11/lib/X11/XKBSetMap.c +++ b/nx-X11/lib/X11/XKBSetMap.c @@ -59,14 +59,14 @@ _XkbWriteKeyTypes(Display *dpy, XkbDescPtr xkb, xkbSetMapReq *req) { char *buf; XkbKeyTypePtr type; - int i, n, sz; + int i, n; xkbKeyTypeWireDesc *desc; if ((req->present & XkbKeyTypesMask) == 0) return; type = &xkb->map->types[req->firstType]; for (i = 0; i < req->nTypes; i++, type++) { - sz = SIZEOF(xkbKeyTypeWireDesc); + int sz = SIZEOF(xkbKeyTypeWireDesc); sz += type->map_count * SIZEOF(xkbKTSetMapEntryWireDesc); if (type->preserve) sz += type->map_count * SIZEOF(xkbModsWireDesc); @@ -79,9 +79,8 @@ _XkbWriteKeyTypes(Display *dpy, XkbDescPtr xkb, xkbSetMapReq *req) desc->preserve = (type->preserve != NULL); buf = (char *) &desc[1]; if (desc->nMapEntries > 0) { - xkbKTSetMapEntryWireDesc *wire; + xkbKTSetMapEntryWireDesc *wire = (xkbKTSetMapEntryWireDesc *) buf; - wire = (xkbKTSetMapEntryWireDesc *) buf; for (n = 0; n < type->map_count; n++, wire++) { wire->level = type->map[n].level; wire->realMods = type->map[n].mods.real_mods; @@ -89,9 +88,8 @@ _XkbWriteKeyTypes(Display *dpy, XkbDescPtr xkb, xkbSetMapReq *req) } buf = (char *) wire; if (type->preserve) { - xkbModsWireDesc *pwire; + xkbModsWireDesc *pwire = (xkbModsWireDesc *) buf; - pwire = (xkbModsWireDesc *) buf; for (n = 0; n < type->map_count; n++, pwire++) { pwire->realMods = type->preserve[n].real_mods; pwire->virtualMods = type->preserve[n].vmods; |