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

xkb: drop never used XkmProbe() 

This function was (accidentally ?) added back in 2008, but never used.

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

3
include/xkbfile.h
View File

@ -263,9 +263,6 @@ extern _X_EXPORT Bool XkbWriteXKBKeymapForNames(FILE * /* file */ ,
/***====================================================================***/ /***====================================================================***/
extern _X_EXPORT Bool XkmProbe(FILE * /* file */
);
extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ , extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
unsigned /* need */ , unsigned /* need */ ,
unsigned /* want */ , unsigned /* want */ ,

17
xkb/xkmread.c
View File

@ -1168,23 +1168,6 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
return nRead; return nRead;
} }
Bool
XkmProbe(FILE * file)
{
unsigned hdr, tmp;
int nRead = 0;
hdr = (('x' << 24) | ('k' << 16) | ('m' << 8) | XkmFileVersion);
tmp = XkmGetCARD32(file, &nRead);
if (tmp != hdr) {
if ((tmp & (~0xff)) == (hdr & (~0xff))) {
_XkbLibError(_XkbErrBadFileVersion, "XkmProbe", tmp & 0xff);
}
return 0;
}
return 1;
}
static Bool static Bool
XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc, XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc,
xkmSectionInfo * toc) xkmSectionInfo * toc)