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

xkb: drop ununsed XkbNameMatchesPattern() 

Not used anywhere, also not in drivers, so we can drop it.
Probably never been used, just added accidentially back in 2008.

Fixes: 68bd7ac193
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1477>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-05 15:30:44 +02:00 committed by Marge Bot
parent 992aba3cb7
commit beb073813e
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/xkbfile.h
View File

@ -207,10 +207,6 @@ extern _X_EXPORT unsigned XkbConvertGetByNameComponents(Bool /* toXkm */ ,
unsigned /* orig */ unsigned /* orig */
); );
extern _X_EXPORT Bool XkbNameMatchesPattern(char * /* name */ ,
char * /* pattern */
);
/***====================================================================***/ /***====================================================================***/
extern _X_EXPORT Bool XkbWriteXKBKeycodes(FILE * /* file */ , extern _X_EXPORT Bool XkbWriteXKBKeycodes(FILE * /* file */ ,

34
xkb/xkbfmisc.c
View File

@ -431,37 +431,3 @@ XkbConvertGetByNameComponents(Bool toXkm, unsigned orig)
} }
return rtrn; return rtrn;
} }
/***====================================================================***/
#define UNMATCHABLE(c) (((c)=='(')||((c)==')')||((c)=='/'))
Bool
XkbNameMatchesPattern(char *name, char *ptrn)
{
while (ptrn[0] != '\0') {
if (name[0] == '\0') {
if (ptrn[0] == '*') {
ptrn++;
continue;
}
return FALSE;
}
if (ptrn[0] == '?') {
if (UNMATCHABLE(name[0]))
return FALSE;
}
else if (ptrn[0] == '*') {
if ((!UNMATCHABLE(name[0])) &&
XkbNameMatchesPattern(name + 1, ptrn))
return TRUE;
return XkbNameMatchesPattern(name, ptrn + 1);
}
else if (ptrn[0] != name[0])
return FALSE;
name++;
ptrn++;
}
/* if we get here, the pattern is exhausted (-:just like me:-) */
return name[0] == '\0';
}