diff options
| -rw-r--r-- | xkb/ddxList.c | 2 | ||||
| -rw-r--r-- | xkb/xkb.c | 27 | ||||
| -rw-r--r-- | xkb/xkbPrKeyEv.c | 4 | ||||
| -rw-r--r-- | xkb/xkbtext.c | 1 | ||||
| -rw-r--r-- | xkb/xkmread.c | 2 |
5 files changed, 15 insertions, 21 deletions
diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 79f46379c..729c5aecf 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -131,8 +131,6 @@ XkbDDXListComponent(DeviceIntPtr dev, file = list->pattern[what]; map = strrchr(file, '('); if (map != NULL) { - char *tmp; - map++; tmp = strrchr(map, ')'); if ((tmp == NULL) || (tmp[1] != '\0')) { @@ -57,10 +57,10 @@ static RESTYPE RT_XKBCLIENT; #define CHK_DEVICE(dev, id, client, access_mode, lf) {\ int why;\ - int rc = lf(&(dev), id, client, access_mode, &why);\ - if (rc != Success) {\ + int tmprc = lf(&(dev), id, client, access_mode, &why);\ + if (tmprc != Success) {\ client->errorValue = _XkbErrCode2(why, id);\ - return rc;\ + return tmprc;\ }\ } @@ -1026,22 +1026,22 @@ XkbWriteKeyTypes(XkbDescPtr xkb, buf = (char *) &wire[1]; if (wire->nMapEntries > 0) { - xkbKTMapEntryWireDesc *wire; + xkbKTMapEntryWireDesc *ewire; XkbKTMapEntryPtr entry; - wire = (xkbKTMapEntryWireDesc *) buf; + ewire = (xkbKTMapEntryWireDesc *) buf; entry = type->map; - for (n = 0; n < type->map_count; n++, wire++, entry++) { - wire->active = entry->active; - wire->mask = entry->mods.mask; - wire->level = entry->level; - wire->realMods = entry->mods.real_mods; - wire->virtualMods = entry->mods.vmods; + for (n = 0; n < type->map_count; n++, ewire++, entry++) { + ewire->active = entry->active; + ewire->mask = entry->mods.mask; + ewire->level = entry->level; + ewire->realMods = entry->mods.real_mods; + ewire->virtualMods = entry->mods.vmods; if (client->swapped) { - swaps(&wire->virtualMods); + swaps(&ewire->virtualMods); } } - buf = (char *) wire; + buf = (char *) ewire; if (type->preserve != NULL) { xkbModsWireDesc *pwire; XkbModsPtr preserve; @@ -2903,7 +2903,6 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev, } if (req->groups != 0) { - unsigned i, bit; xkbModsWireDesc *wire = (xkbModsWireDesc *) data; for (i = 0, bit = 1; i < XkbNumKbdGroups; i++, bit <<= 1) { diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 32411838d..b24fd6cb7 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -104,13 +104,13 @@ XkbProcessKeyboardEvent(DeviceEvent *event, DeviceIntPtr keybd) return; } if (rg->currentDown != 0) { - int key = event->detail.key; + int tmpkey = event->detail.key; event->type = ET_KeyRelease; event->detail.key = rg->currentDown; XkbHandleActions(keybd, keybd, event); event->type = ET_KeyPress; - event->detail.key = key; + event->detail.key = tmpkey; } rg->currentDown = key; } diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index f66a08f75..fdf1d1790 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -1266,7 +1266,6 @@ XkbBehaviorText(XkbDescPtr xkb, XkbBehavior * behavior, unsigned format) } else if (type == XkbKB_RadioGroup) { int g; - char *tmp; g = ((behavior->data) & (~XkbKB_RGAllowNone)) + 1; if (XkbKB_RGAllowNone & behavior->data) { diff --git a/xkb/xkmread.c b/xkb/xkmread.c index 45da965dc..258bb91b5 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -772,8 +772,6 @@ ReadXkmSymbols(FILE * file, XkbDescPtr xkb) memset((char *) typeName, 0, XkbNumKbdGroups * sizeof(Atom)); memset((char *) type, 0, XkbNumKbdGroups * sizeof(XkbKeyTypePtr)); if (wireMap.flags & XkmKeyHasTypes) { - register int g; - for (g = 0; g < XkbNumKbdGroups; g++) { if ((wireMap.flags & (1 << g)) && ((tmp = XkmGetCountedString(file, buf, 100)) > 0)) { |