StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
master
Peter Hutterer 2019-11-12 14:39:47 +10:00 committed by Ran Benita
parent 2a578a60b3
commit d9b9885624
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xkbcomp/rules.c
View File

@ -619,7 +619,7 @@ static bool
append_expanded_kccgst_value(struct matcher *m, darray_char *to, append_expanded_kccgst_value(struct matcher *m, darray_char *to,
struct sval value) struct sval value)
{ {
const char *s = value.start; const char *str = value.start;
darray_char expanded = darray_new(); darray_char expanded = darray_new();
char ch; char ch;
bool expanded_plus, to_plus; bool expanded_plus, to_plus;
@ -635,9 +635,9 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to,
struct matched_sval *expanded_value; struct matched_sval *expanded_value;
/* Check if that's a start of an expansion. */ /* Check if that's a start of an expansion. */
if (s[i] != '%') { if (str[i] != '%') {
/* Just a normal character. */ /* Just a normal character. */
darray_appends_nullterminate(expanded, &s[i++], 1); darray_appends_nullterminate(expanded, &str[i++], 1);
continue; continue;
} }
if (++i >= value.len) goto error; if (++i >= value.len) goto error;
@ -645,15 +645,15 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to,
pfx = sfx = 0; pfx = sfx = 0;
/* Check for prefix. */ /* Check for prefix. */
if (s[i] == '(' || s[i] == '+' || s[i] == '|' || if (str[i] == '(' || str[i] == '+' || str[i] == '|' ||
s[i] == '_' || s[i] == '-') { str[i] == '_' || str[i] == '-') {
pfx = s[i]; pfx = str[i];
if (s[i] == '(') sfx = ')'; if (str[i] == '(') sfx = ')';
if (++i >= value.len) goto error; if (++i >= value.len) goto error;
} }
/* Mandatory model/layout/variant specifier. */ /* Mandatory model/layout/variant specifier. */
switch (s[i++]) { switch (str[i++]) {
case 'm': mlv = MLVO_MODEL; break; case 'm': mlv = MLVO_MODEL; break;
case 'l': mlv = MLVO_LAYOUT; break; case 'l': mlv = MLVO_LAYOUT; break;
case 'v': mlv = MLVO_VARIANT; break; case 'v': mlv = MLVO_VARIANT; break;
@ -662,7 +662,7 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to,
/* Check for index. */ /* Check for index. */
idx = XKB_LAYOUT_INVALID; idx = XKB_LAYOUT_INVALID;
if (i < value.len && s[i] == '[') { if (i < value.len && str[i] == '[') {
int consumed; int consumed;
if (mlv != MLVO_LAYOUT && mlv != MLVO_VARIANT) { if (mlv != MLVO_LAYOUT && mlv != MLVO_VARIANT) {
@ -670,7 +670,7 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to,
goto error; 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; if (consumed == -1) goto error;
i += consumed; 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. */ /* Check for suffix, if there supposed to be one. */
if (sfx != 0) { if (sfx != 0) {
if (i >= value.len) goto error; if (i >= value.len) goto error;
if (s[i++] != sfx) goto error; if (str[i++] != sfx) goto error;
} }
/* Get the expanded value. */ /* Get the expanded value. */