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

xkb: maprules: put some loop counters into local scope 

Prevent from being accidentially removed and making the code a
little bit easier to understand.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1840>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-26 11:40:36 +01:00 committed by Marge Bot
parent 60d37d0158
commit ffd7ca8af2
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xkb/maprules.c
View File

@ -262,7 +262,6 @@ SetUpRemap(InputLine * line, RemapSpec * remap)
{ {
char *tok, *str; char *tok, *str;
unsigned present, l_ndx_present, v_ndx_present; unsigned present, l_ndx_present, v_ndx_present;
register int i;
int len, ndx; int len, ndx;
_Xstrtokparams strtok_buf; _Xstrtokparams strtok_buf;
Bool found; Bool found;
@ -277,7 +276,7 @@ SetUpRemap(InputLine * line, RemapSpec * remap)
str = NULL; str = NULL;
if (strcmp(tok, "=") == 0) if (strcmp(tok, "=") == 0)
continue; continue;
for (i = 0; i < MAX_WORDS; i++) { for (int i = 0; i < MAX_WORDS; i++) {
len = strlen(cname[i]); len = strlen(cname[i]);
if (strncmp(cname[i], tok, len) == 0) { if (strncmp(cname[i], tok, len) == 0) {
if (strlen(tok) > len) { if (strlen(tok) > len) {
@ -323,7 +322,7 @@ SetUpRemap(InputLine * line, RemapSpec * remap)
unsigned mask = PART_MASK; unsigned mask = PART_MASK;
ErrorF("Mapping needs at least one of "); ErrorF("Mapping needs at least one of ");
for (i = 0; (i < MAX_WORDS); i++) { for (int i = 0; (i < MAX_WORDS); i++) {
if ((1L << i) & mask) { if ((1L << i) & mask) {
mask &= ~(1L << i); mask &= ~(1L << i);
if (mask) if (mask)
@ -376,7 +375,7 @@ CheckLine(InputLine * line,
RemapSpec * remap, XkbRF_RulePtr rule, XkbRF_GroupPtr group) RemapSpec * remap, XkbRF_RulePtr rule, XkbRF_GroupPtr group)
{ {
char *str, *tok; char *str, *tok;
register int nread, i; register int nread;
FileSpec tmp; FileSpec tmp;
_Xstrtokparams strtok_buf; _Xstrtokparams strtok_buf;
Bool append = FALSE; Bool append = FALSE;
@ -398,6 +397,8 @@ CheckLine(InputLine * line,
return FALSE; return FALSE;
group->name = Xstrdup(gname); group->name = Xstrdup(gname);
group->words = Xstrdup(words); group->words = Xstrdup(words);
int i;
for (i = 1, words = group->words; *words; words++) { for (i = 1, words = group->words; *words; words++) {
if (*words == ' ') { if (*words == ' ') {
*words++ = '\0'; *words++ = '\0';
@ -461,7 +462,7 @@ CheckLine(InputLine * line,
rule->geometry = Xstrdup(tmp.name[GEOMETRY]); rule->geometry = Xstrdup(tmp.name[GEOMETRY]);
rule->layout_num = rule->variant_num = 0; rule->layout_num = rule->variant_num = 0;
for (i = 0; i < nread; i++) { for (int i = 0; i < nread; i++) {
if (remap->remap[i].index) { if (remap->remap[i].index) {
if (remap->remap[i].word == LAYOUT) if (remap->remap[i].word == LAYOUT)
rule->layout_num = remap->remap[i].index; rule->layout_num = remap->remap[i].index;
@ -489,9 +490,7 @@ _Concat(char *str1, const char *str2)
static void static void
squeeze_spaces(char *p1) squeeze_spaces(char *p1)
{ {
char *p2; for (char *p2 = p1; *p2; p2++) {
for (p2 = p1; *p2; p2++) {
*p1 = *p2; *p1 = *p2;
if (*p1 != ' ') if (*p1 != ' ')
p1++; p1++;
@ -517,7 +516,6 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
else { else {
char *p; char *p;
char *layout; char *layout;
int i;
layout = Xstrdup(defs->layout); layout = Xstrdup(defs->layout);
if (layout == NULL) if (layout == NULL)
@ -525,7 +523,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
squeeze_spaces(layout); squeeze_spaces(layout);
mdefs->layout[1] = layout; mdefs->layout[1] = layout;
p = layout; p = layout;
for (i = 2; i <= XkbNumKbdGroups; i++) { for (int i = 2; i <= XkbNumKbdGroups; i++) {
if ((p = strchr(p, ','))) { if ((p = strchr(p, ','))) {
*p++ = '\0'; *p++ = '\0';
mdefs->layout[i] = p; mdefs->layout[i] = p;
@ -546,7 +544,6 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
else { else {
char *p; char *p;
char *variant; char *variant;
int i;
variant = Xstrdup(defs->variant); variant = Xstrdup(defs->variant);
if (variant == NULL) if (variant == NULL)
@ -554,7 +551,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
squeeze_spaces(variant); squeeze_spaces(variant);
mdefs->variant[1] = variant; mdefs->variant[1] = variant;
p = variant; p = variant;
for (i = 2; i <= XkbNumKbdGroups; i++) { for (int i = 2; i <= XkbNumKbdGroups; i++) {
if ((p = strchr(p, ','))) { if ((p = strchr(p, ','))) {
*p++ = '\0'; *p++ = '\0';
mdefs->variant[i] = p; mdefs->variant[i] = p;