xserver: Branch 'master'

[GitLab Mirror]

 include/xkbfile.h |    3 ---
 xkb/xkmread.c     |   17 -----------------
 2 files changed, 20 deletions(-)

New commits:
commit fdea36708cd007387cfac334c5b32ab826096279
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Apr 5 13:43:25 2024 +0200

    xkb: drop never used XkmProbe()
    
    This function was (accidentally ?) added back in 2008, but never used.
    
    Fixes: 68bd7ac1930b5cffb6657b8d5f5bf8ae58eae8d9
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1472>

diff --git a/include/xkbfile.h b/include/xkbfile.h
index f93d31ab0..8a2fec40c 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -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 */ ,
                                       unsigned /* need */ ,
                                       unsigned /* want */ ,
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 842887c09..007c764cb 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -1168,23 +1168,6 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
     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
 XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc,
            xkmSectionInfo * toc)