From 434044cb080e7e0cf2d173df352033f491bf6889 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 5 Apr 2024 14:52:05 +0200
Subject: [PATCH] xkb: unexport functions from xkbtext.c

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

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1475>
---
 include/xkbfile.h  | 78 ----------------------------------------------
 xkb/xkbout.c       |  4 ++-
 xkb/xkbtext.c      |  5 +--
 xkb/xkbtext_priv.h | 32 +++++++++++++++++++
 4 files changed, 38 insertions(+), 81 deletions(-)
 create mode 100644 xkb/xkbtext_priv.h

diff --git a/include/xkbfile.h b/include/xkbfile.h
index bfc83ac92..7f0a3a0e9 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -78,84 +78,6 @@ typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
 
 _XFUNCPROTOBEGIN
 
-extern _X_EXPORT char *XkbIndentText(unsigned   /* size */
-    );
-
-extern _X_EXPORT char *XkbAtomText(Atom /* atm */ ,
-                                   unsigned     /* format */
-    );
-
-extern _X_EXPORT char *XkbKeysymText(KeySym /* sym */ ,
-                                     unsigned   /* format */
-    );
-
-extern _X_EXPORT char *XkbStringText(char * /* str */ ,
-                                     unsigned   /* format */
-    );
-
-extern _X_EXPORT char *XkbKeyNameText(char * /* name */ ,
-                                      unsigned  /* format */
-    );
-
-extern _X_EXPORT char *XkbModIndexText(unsigned /* ndx */ ,
-                                       unsigned /* format */
-    );
-
-extern _X_EXPORT char *XkbModMaskText(unsigned /* mask */ ,
-                                      unsigned  /* format */
-    );
-
-extern _X_EXPORT char *XkbVModIndexText(XkbDescPtr /* xkb */ ,
-                                        unsigned /* ndx */ ,
-                                        unsigned        /* format */
-    );
-
-extern _X_EXPORT char *XkbVModMaskText(XkbDescPtr /* xkb */ ,
-                                       unsigned /* modMask */ ,
-                                       unsigned /* mask */ ,
-                                       unsigned /* format */
-    );
-
-extern _X_EXPORT char *XkbConfigText(unsigned /* config */ ,
-                                     unsigned   /* format */
-    );
-
-extern _X_EXPORT const char *XkbSIMatchText(unsigned /* type */ ,
-                                            unsigned    /* format */
-    );
-
-extern _X_EXPORT char *XkbIMWhichStateMaskText(unsigned /* use_which */ ,
-                                               unsigned /* format */
-    );
-
-extern _X_EXPORT char *XkbControlsMaskText(unsigned /* ctrls */ ,
-                                           unsigned     /* format */
-    );
-
-extern _X_EXPORT char *XkbGeomFPText(int /* val */ ,
-                                     unsigned   /* format */
-    );
-
-extern _X_EXPORT char *XkbDoodadTypeText(unsigned /* type */ ,
-                                         unsigned       /* format */
-    );
-
-extern _X_EXPORT const char *XkbActionTypeText(unsigned /* type */ ,
-                                               unsigned /* format */
-    );
-
-extern _X_EXPORT char *XkbActionText(XkbDescPtr /* xkb */ ,
-                                     XkbAction * /* action */ ,
-                                     unsigned   /* format */
-    );
-
-extern _X_EXPORT char *XkbBehaviorText(XkbDescPtr /* xkb */ ,
-                                       XkbBehavior * /* behavior */ ,
-                                       unsigned /* format */
-    );
-
-/***====================================================================***/
-
 #define	_XkbKSLower	(1<<0)
 #define	_XkbKSUpper	(1<<1)
 
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 46e07db3f..297b3aa9c 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -32,11 +32,13 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <X11/Xfuncs.h>
-
 #include <X11/X.h>
 #include <X11/keysym.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XKMformat.h>
+
+#include "xkb/xkbtext_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 7f377fdfc..7bc93bfac 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -31,12 +31,13 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-
 #include <X11/Xos.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XKMformat.h>
+
+#include "xkb/xkbtext_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
diff --git a/xkb/xkbtext_priv.h b/xkb/xkbtext_priv.h
new file mode 100644
index 000000000..470b8dca2
--- /dev/null
+++ b/xkb/xkbtext_priv.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_XKB_XKBTEXT_PRIV_H
+#define _XSERVER_XKB_XKBTEXt_PRIV_H
+
+#include <X11/X.h>
+
+#include "xkbstr.h"
+
+char *XkbIndentText(unsigned size);
+char *XkbAtomText(Atom atm, unsigned format);
+char *XkbKeysymText(KeySym sym, unsigned format);
+char *XkbStringText(char *str, unsigned format);
+char *XkbKeyNameText(char *name, unsigned format);
+char *XkbModIndexText(unsigned ndx, unsigned format);
+char *XkbModMaskText(unsigned mask, unsigned format);
+char *XkbVModIndexText(XkbDescPtr xkb, unsigned ndx, unsigned format);
+char *XkbVModMaskText(XkbDescPtr xkb, unsigned modMask, unsigned mask,
+                      unsigned format);
+char *XkbConfigText(unsigned config, unsigned format);
+const char *XkbSIMatchText(unsigned type, unsigned format);
+char *XkbIMWhichStateMaskText(unsigned use_which, unsigned format);
+char *XkbControlsMaskText(unsigned ctrls, unsigned format);
+char *XkbGeomFPText(int val, unsigned format);
+char *XkbDoodadTypeText(unsigned type, unsigned format);
+const char *XkbActionTypeText(unsigned type, unsigned format);
+char *XkbActionText(XkbDescPtr xkb, XkbAction *action, unsigned format);
+char *XkbBehaviorText(XkbDescPtr xkb, XkbBehavior *behavior, unsigned format);
+
+#endif /* _XSERVER_XKB_XKBTEXT_PRIV_H */