diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2019-11-12 14:39:47 +1000 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2019-12-24 09:50:03 +0200 |
| commit | d9b9885624d38a2c253428fce94ad2d67aea7667 (patch) | |
| tree | ef822c9fbe8dd850563c46ecf4de21744b45c4f3 /src/xkbcomp | |
| parent | 2a578a60b3967403d68adf26c76bfdc0532f315c (diff) | |
| download | xorg-lib-libxkbcommon-d9b9885624d38a2c253428fce94ad2d67aea7667.tar.gz | |
rules: rename a variable from 's' to 'str'
To avoid name conflicts with a future patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/xkbcomp')
| -rw-r--r-- | src/xkbcomp/rules.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/xkbcomp/rules.c b/src/xkbcomp/rules.c index a6abd52..30c2f45 100644 --- a/src/xkbcomp/rules.c +++ b/src/xkbcomp/rules.c @@ -619,7 +619,7 @@ static bool append_expanded_kccgst_value(struct matcher *m, darray_char *to, struct sval value) { - const char *s = value.start; + const char *str = value.start; darray_char expanded = darray_new(); char ch; bool expanded_plus, to_plus; @@ -635,9 +635,9 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, struct matched_sval *expanded_value; /* Check if that's a start of an expansion. */ - if (s[i] != '%') { + if (str[i] != '%') { /* Just a normal character. */ - darray_appends_nullterminate(expanded, &s[i++], 1); + darray_appends_nullterminate(expanded, &str[i++], 1); continue; } if (++i >= value.len) goto error; @@ -645,15 +645,15 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, pfx = sfx = 0; /* Check for prefix. */ - if (s[i] == '(' || s[i] == '+' || s[i] == '|' || - s[i] == '_' || s[i] == '-') { - pfx = s[i]; - if (s[i] == '(') sfx = ')'; + if (str[i] == '(' || str[i] == '+' || str[i] == '|' || + str[i] == '_' || str[i] == '-') { + pfx = str[i]; + if (str[i] == '(') sfx = ')'; if (++i >= value.len) goto error; } /* Mandatory model/layout/variant specifier. */ - switch (s[i++]) { + switch (str[i++]) { case 'm': mlv = MLVO_MODEL; break; case 'l': mlv = MLVO_LAYOUT; break; case 'v': mlv = MLVO_VARIANT; break; @@ -662,7 +662,7 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, /* Check for index. */ idx = XKB_LAYOUT_INVALID; - if (i < value.len && s[i] == '[') { + if (i < value.len && str[i] == '[') { int consumed; if (mlv != MLVO_LAYOUT && mlv != MLVO_VARIANT) { @@ -670,7 +670,7 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, goto error; } - consumed = extract_layout_index(s + i, value.len - i, &idx); + consumed = extract_layout_index(str + i, value.len - i, &idx); if (consumed == -1) goto error; i += consumed; } @@ -678,7 +678,7 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, /* Check for suffix, if there supposed to be one. */ if (sfx != 0) { if (i >= value.len) goto error; - if (s[i++] != sfx) goto error; + if (str[i++] != sfx) goto error; } /* Get the expanded value. */ |