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

xkb: unexport remaining internal declarations 

These are only used inside xkb/*, so no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1729>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-05 16:46:59 +02:00 committed by Marge Bot
parent 660657a2c3
commit 3f8a5475c9
4 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
include/xkbfile.h
View File

@ -29,53 +29,4 @@
#include "xkbstr.h"
typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
int /* fileSection */ ,
void * /* priv */
);
/***====================================================================***/
#define _XkbSuccess 0 /* unused */
#define _XkbErrMissingNames 1
#define _XkbErrMissingTypes 2
#define _XkbErrMissingReqTypes 3
#define _XkbErrMissingSymbols 4
#define _XkbErrMissingVMods 5 /* unused */
#define _XkbErrMissingIndicators 6 /* unused */
#define _XkbErrMissingCompatMap 7
#define _XkbErrMissingSymInterps 8 /* unused */
#define _XkbErrMissingGeometry 9
#define _XkbErrIllegalDoodad 10 /* unused */
#define _XkbErrIllegalTOCType 11 /* unused */
#define _XkbErrIllegalContents 12
#define _XkbErrEmptyFile 13 /* unused */
#define _XkbErrFileNotFound 14 /* unused */
#define _XkbErrFileCannotOpen 15 /* unused */
#define _XkbErrBadValue 16
#define _XkbErrBadMatch 17
#define _XkbErrBadTypeName 18
#define _XkbErrBadTypeWidth 19
#define _XkbErrBadFileType 20
#define _XkbErrBadFileVersion 21
#define _XkbErrBadFileFormat 22 /* unused */
#define _XkbErrBadAlloc 23
#define _XkbErrBadLength 24
#define _XkbErrXReqFailure 25 /* unused */
#define _XkbErrBadImplementation 26
/***====================================================================***/
_XFUNCPROTOBEGIN
extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
unsigned /* need */ ,
unsigned /* want */ ,
XkbDescPtr * /* result */
);
_XFUNCPROTOEND
#endif /* _XKBFILE_H_ */

1
xkb/ddxLoad.c
View File

@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "dix/dix_priv.h"
#include "os/osdep.h"
#include "xkb/xkbfile_priv.h"
#include "xkb/xkbfmisc_priv.h"
#include "inputstr.h"

45
xkb/xkbfile_priv.h Normal file
View File

@ -0,0 +1,45 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
* Copyright © 1994 by Silicon Graphics Computer Systems, Inc.
*/
#ifndef _XSERVER_XKB_XKBFILE_PRIV_H
#define _XSERVER_XKB_XKBFILE_PRIV_H
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
#include "xkbstr.h"
/* XKB error codes */
#define _XkbErrMissingNames 1
#define _XkbErrMissingTypes 2
#define _XkbErrMissingReqTypes 3
#define _XkbErrMissingSymbols 4
#define _XkbErrMissingCompatMap 7
#define _XkbErrMissingGeometry 9
#define _XkbErrIllegalContents 12
#define _XkbErrBadValue 16
#define _XkbErrBadMatch 17
#define _XkbErrBadTypeName 18
#define _XkbErrBadTypeWidth 19
#define _XkbErrBadFileType 20
#define _XkbErrBadFileVersion 21
#define _XkbErrBadAlloc 23
#define _XkbErrBadLength 24
#define _XkbErrBadImplementation 26
/*
* read xkm file
*
* @param file the FILE to read from
* @param need mask of needed elements (fails if some are missing)
* @param want mask of wanted elements
* @param result pointer to xkb descriptor to load the data into
* @return mask of elements missing (from need | want)
*/
unsigned XkmReadFile(FILE *file, unsigned need, unsigned want,
XkbDescPtr *result);
#endif /* _XSERVER_XKB_XKBFILE_PRIV_H */

1
xkb/xkmread.c
View File

@ -34,6 +34,7 @@
#include <X11/keysym.h>
#include <X11/extensions/XKMformat.h>
#include "xkb/xkbfile_priv.h"
#include "xkb/xkbfmisc_priv.h"
#include "misc.h"