diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-03-25 23:09:50 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-03-25 23:09:50 +0000 |
| commit | d7b9e2b0e9d6889ea6b05e63892e612f4e5f19f5 (patch) | |
| tree | 080fe7bfb71b281ef9e9f161397be3aab923965c /xkb | |
| parent | b3570dd94aa72f94e537a17680150e91e7712f5a (diff) | |
Bug #3819: Remove open-coding of strcasecmp.
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/maprules.c | 8 | ||||
| -rw-r--r-- | xkb/xkbfmisc.c | 28 |
2 files changed, 4 insertions, 32 deletions
diff --git a/xkb/maprules.c b/xkb/maprules.c index 3c4905ad1..6ab8e26eb 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -1106,13 +1106,13 @@ int len,headingtype,extra_ndx = 0; for ( ; GetInputLine(file,&line,False); line.num_line= 0) { if (line.line[0]=='!') { tok = strtok(&(line.line[1]), " \t"); - if (!_XkbStrCaseCmp(tok,"model")) + if (strcmp(tolower(tok),"model") == 0) headingtype = HEAD_MODEL; - else if (!_XkbStrCaseCmp(tok,"layout")) + else if (strcmp(tolower(tok),"layout") == 0) headingtype = HEAD_LAYOUT; - else if (!_XkbStrCaseCmp(tok,"variant")) + else if (strcmp(tolower(tok),"variant") == 0) headingtype = HEAD_VARIANT; - else if (!_XkbStrCaseCmp(tok,"option")) + else if (strcmp(tolower(tok),"option") == 0) headingtype = HEAD_OPTION; else { int i; diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index cca31f778..01f6174aa 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -150,34 +150,6 @@ unsigned set,rtrn; /***===================================================================***/ -int -_XkbStrCaseCmp(char *str1,char *str2) -{ - char buf1[512],buf2[512]; - char c, *s; - register int n; - - for (n=0, s = buf1; (c = *str1++); n++) { - if (isupper(c)) - c = tolower(c); - if (n>510) - break; - *s++ = c; - } - *s = '\0'; - for (n=0, s = buf2; (c = *str2++); n++) { - if (isupper(c)) - c = tolower(c); - if (n>510) - break; - *s++ = c; - } - *s = '\0'; - return (strcmp(buf1, buf2)); -} - -/***===================================================================***/ - Bool XkbLookupGroupAndLevel( XkbDescPtr xkb, int key, |