os: unexport client connection handling functions from public module API

These functions aren't used by any known driver and it doesn't make much sense
calling them from there. So it's better to unexport them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/xace.c

@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "xacestr.h"
+#include "osdep.h"
 
 CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
 

Xext/xtest.c

@@ -58,6 +58,7 @@
 #include "xserver-properties.h"
 #include "eventstr.h"
 #include "inpututils.h"
+#include "osdep.h"
 
 Bool noTestExtensions = FALSE;
 

damageext/damageext.c

@@ -30,6 +30,7 @@
 #include "damagestr.h"
 #include "protocol-versions.h"
 #include "dixstruct_priv.h"
+#include "osdep.h"
 
 #ifdef XINERAMA
 #include "panoramiX.h"

dix/events.c

@@ -153,6 +153,7 @@ Equipment Corporation.
 #include "eventstr.h"
 #include "enterleave.h"
 #include "mi.h"
+#include "osdep.h"
 
 #define _XkbWantsDetectableAutoRepeat(c) \
         ((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)

dri3/dri3_request.c

@@ -33,6 +33,7 @@
 #include <drm_fourcc.h>
 #include "randrstr_priv.h"
 #include "dixstruct_priv.h"
+#include "osdep.h"
 
 static Bool
 dri3_screen_can_one_point_four(ScreenPtr screen)

glx/glxext.c

@@ -43,6 +43,7 @@
 #include "indirect_table.h"
 #include "indirect_util.h"
 #include "glxvndabi.h"
+#include "osdep.h"
 
 /*
 ** X resources.

hw/xfree86/dri2/dri2.c

@@ -46,6 +46,7 @@
 #include "dri2int.h"
 #include "damage.h"
 #include "xf86.h"
+#include "osdep.h"
 
 CARD8 dri2_major;               /* version of DRI2 supported by DDX */
 CARD8 dri2_minor;

hw/xwayland/xwayland-drm-lease.c

@@ -36,6 +36,8 @@
 #include "xwayland-screen.h"
 #include "xwayland-output.h"
 
+#include "osdep.h"
+
 static void
 xwl_randr_lease_cleanup_outputs(RRLeasePtr rrLease)
 {

include/os.h

@@ -84,35 +84,9 @@ typedef struct _NewClientRec *NewClientPtr;
 #include <stdio.h>
 #include <stdarg.h>
 
-extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client */ );
-
-extern _X_EXPORT int WriteFdToClient(ClientPtr client, int fd, Bool do_close);
-
-extern _X_EXPORT Bool InsertFakeRequest(ClientPtr /*client */ ,
-                                        char * /*data */ ,
-                                        int /*count */ );
-
-extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client */ );
-
-extern _X_EXPORT void FlushAllOutput(void);
-
-extern _X_EXPORT void FlushIfCriticalOutputPending(void);
-
-extern _X_EXPORT void SetCriticalOutputPending(void);
-
 extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
                                    const void * /*buf */ );
 
-extern _X_EXPORT void ResetOsBuffers(void);
-
-extern _X_EXPORT void NotifyParentProcess(void);
-
-extern _X_EXPORT void CreateWellKnownSockets(void);
-
-extern _X_EXPORT void ResetWellKnownSockets(void);
-
-extern _X_EXPORT void CloseWellKnownConnections(void);
-
 extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client */ );
 
 extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
@@ -139,10 +113,6 @@ extern _X_EXPORT void IgnoreClient(ClientPtr /*client */ );
 
 extern _X_EXPORT void AttendClient(ClientPtr /*client */ );
 
-extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
-
-extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
-
 extern _X_EXPORT CARD32 GetTimeInMillis(void);
 extern _X_EXPORT CARD64 GetTimeInMicros(void);
 
@@ -247,12 +217,6 @@ OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
 extern _X_EXPORT Bool
 PrivsElevated(void);
 
-extern _X_EXPORT int
-GetClientFd(ClientPtr);
-
-extern _X_EXPORT Bool
-ClientIsLocal(ClientPtr client);
-
 /* stuff for ReplyCallback */
 extern _X_EXPORT CallbackListPtr ReplyCallback;
 typedef struct {

os/osdep.h

@@ -223,4 +223,30 @@ extern Bool AllowByteSwappedClients;
 
 int Ones(unsigned long mask);
 
+Bool WaitForSomething(Bool clients_are_ready);
+int ReadRequestFromClient(ClientPtr client);
+int ReadFdFromClient(ClientPtr client);
+int WriteFdToClient(ClientPtr client, int fd, Bool do_close);
+Bool InsertFakeRequest(ClientPtr client, char *data, int count);
+void FlushAllOutput(void);
+void FlushIfCriticalOutputPending(void);
+void SetCriticalOutputPending(void);
+void ResetOsBuffers(void);
+void NotifyParentProcess(void);
+void CreateWellKnownSockets(void);
+void ResetWellKnownSockets(void);
+void CloseWellKnownConnections(void);
+void CloseDownConnection(ClientPtr client);
+
+int OnlyListenToOneClient(ClientPtr client);
+void MakeClientGrabImpervious(ClientPtr client);
+void MakeClientGrabPervious(ClientPtr client);
+void ListenOnOpenFD(int fd, int noxauth);
+Bool AddClientOnOpenFD(int fd);
+int GetClientFd(ClientPtr);
+Bool ClientIsLocal(ClientPtr client);
+
+/* not used by external modules, but internal ones, thus need to be dl visible */
+extern _X_EXPORT void ResetCurrentRequest(ClientPtr client);
+
 #endif                          /* _OSDEP_H_ */

randr/rrlease.c

@@ -22,6 +22,7 @@
 #include <dix-config.h>
 
 #include <unistd.h>
+#include "osdep.h"
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"

record/record.c

@@ -49,6 +49,7 @@ and Jim Haggerty of Metheus.
 #include "swaprep.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
+#include "osdep.h"
 
 #ifdef XINERAMA
 #include "globals.h"