merge latest (4.3.99.16) from XFree86 (vendor) branch

parent a4b29bd1
......@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */
/* $XFree86: xc/lib/ICE/ICElib.h,v 3.5 2003/11/17 22:20:05 dawes Exp $ */
#ifndef _ICELIB_H_
#define _ICELIB_H_
......@@ -39,11 +39,7 @@ Author: Ralph Mor, X Consortium
#define True 1
#define False 0
#if NeedFunctionPrototypes
typedef void *IcePointer;
#else
typedef char *IcePointer;
#endif
typedef enum {
IcePoAuthHaveReply,
......@@ -103,16 +99,13 @@ typedef struct _IceConn *IceConn;
typedef struct _IceListenObj *IceListenObj;
typedef void (*IceWatchProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer /* clientData */,
Bool /* opening */,
IcePointer * /* watchData */
#endif
);
typedef void (*IcePoProcessMsgProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer /* clientData */,
int /* opcode */,
......@@ -120,17 +113,14 @@ typedef void (*IcePoProcessMsgProc) (
Bool /* swap */,
IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */
#endif
);
typedef void (*IcePaProcessMsgProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer /* clientData */,
int /* opcode */,
unsigned long /* length */,
Bool /* swap */
#endif
);
typedef struct {
......@@ -146,7 +136,6 @@ typedef struct {
} IcePaVersionRec;
typedef IcePoAuthStatus (*IcePoAuthProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer * /* authStatePtr */,
Bool /* cleanUp */,
......@@ -156,11 +145,9 @@ typedef IcePoAuthStatus (*IcePoAuthProc) (
int * /* replyDataLenRet */,
IcePointer * /* replyDataRet */,
char ** /* errorStringRet */
#endif
);
typedef IcePaAuthStatus (*IcePaAuthProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer * /* authStatePtr */,
Bool /* swap */,
......@@ -169,17 +156,13 @@ typedef IcePaAuthStatus (*IcePaAuthProc) (
int * /* replyDataLenRet */,
IcePointer * /* replyDataRet */,
char ** /* errorStringRet */
#endif
);
typedef Bool (*IceHostBasedAuthProc) (
#if NeedFunctionPrototypes
char * /* hostName */
#endif
);
typedef Status (*IceProtocolSetupProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorVersion */,
int /* minorVersion */,
......@@ -187,31 +170,23 @@ typedef Status (*IceProtocolSetupProc) (
char * /* release */,
IcePointer * /* clientDataRet */,
char ** /* failureReasonRet */
#endif
);
typedef void (*IceProtocolActivateProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer /* clientData */
#endif
);
typedef void (*IceIOErrorProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
typedef void (*IcePingReplyProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePointer /* clientData */
#endif
);
typedef void (*IceErrorHandler) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
Bool /* swap */,
int /* offendingMinorOpcode */,
......@@ -219,13 +194,10 @@ typedef void (*IceErrorHandler) (
int /* errorClass */,
int /* severity */,
IcePointer /* values */
#endif
);
typedef void (*IceIOErrorHandler) (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
......@@ -236,7 +208,6 @@ typedef void (*IceIOErrorHandler) (
_XFUNCPROTOBEGIN
extern int IceRegisterForProtocolSetup (
#if NeedFunctionPrototypes
char * /* protocolName */,
char * /* vendor */,
char * /* release */,
......@@ -246,11 +217,9 @@ extern int IceRegisterForProtocolSetup (
char ** /* authNames */,
IcePoAuthProc * /* authProcs */,
IceIOErrorProc /* IOErrorProc */
#endif
);
extern int IceRegisterForProtocolReply (
#if NeedFunctionPrototypes
char * /* protocolName */,
char * /* vendor */,
char * /* release */,
......@@ -263,120 +232,88 @@ extern int IceRegisterForProtocolReply (
IceProtocolSetupProc /* protocolSetupProc */,
IceProtocolActivateProc /* protocolActivateProc */,
IceIOErrorProc /* IOErrorProc */
#endif
);
extern IceConn IceOpenConnection (
#if NeedFunctionPrototypes
char * /* networkIdsList */,
IcePointer /* context */,
Bool /* mustAuthenticate */,
int /* majorOpcodeCheck */,
int /* errorLength */,
char * /* errorStringRet */
#endif
);
extern IcePointer IceGetConnectionContext (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern Status IceListenForConnections (
#if NeedFunctionPrototypes
int * /* countRet */,
IceListenObj ** /* listenObjsRet */,
int /* errorLength */,
char * /* errorStringRet */
#endif
);
extern Status IceListenForWellKnownConnections (
#if NeedFunctionPrototypes
char * /* port */,
int * /* countRet */,
IceListenObj ** /* listenObjsRet */,
int /* errorLength */,
char * /* errorStringRet */
#endif
);
extern int IceGetListenConnectionNumber (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */
#endif
);
extern char *IceGetListenConnectionString (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */
#endif
);
extern char *IceComposeNetworkIdList (
#if NeedFunctionPrototypes
int /* count */,
IceListenObj * /* listenObjs */
#endif
);
extern void IceFreeListenObjs (
#if NeedFunctionPrototypes
int /* count */,
IceListenObj * /* listenObjs */
#endif
);
extern void IceSetHostBasedAuthProc (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */,
IceHostBasedAuthProc /* hostBasedAuthProc */
#endif
);
extern IceConn IceAcceptConnection (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */,
IceAcceptStatus * /* statusRet */
#endif
);
extern void IceSetShutdownNegotiation (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
Bool /* negotiate */
#endif
);
extern Bool IceCheckShutdownNegotiation (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern IceCloseStatus IceCloseConnection (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern Status IceAddConnectionWatch (
#if NeedFunctionPrototypes
IceWatchProc /* watchProc */,
IcePointer /* clientData */
#endif
);
extern void IceRemoveConnectionWatch (
#if NeedFunctionPrototypes
IceWatchProc /* watchProc */,
IcePointer /* clientData */
#endif
);
extern IceProtocolSetupStatus IceProtocolSetup (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* myOpcode */,
IcePointer /* clientData */,
......@@ -387,127 +324,88 @@ extern IceProtocolSetupStatus IceProtocolSetup (
char ** /* releaseRet */,
int /* errorLength */,
char * /* errorStringRet */
#endif
);
extern Status IceProtocolShutdown (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */
#endif
);
extern IceProcessMessagesStatus IceProcessMessages (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */
#endif
);
extern Status IcePing (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IcePingReplyProc /* pingReplyProc */,
IcePointer /* clientData */
#endif
);
extern char *IceAllocScratch (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
unsigned long /* size */
#endif
);
extern int IceFlush (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern int IceGetOutBufSize (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern int IceGetInBufSize (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern IceConnectStatus IceConnectionStatus (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern char *IceVendor (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern char *IceRelease (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern int IceProtocolVersion (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern int IceProtocolRevision (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern int IceConnectionNumber (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern char *IceConnectionString (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern unsigned long IceLastSentSequenceNumber (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern unsigned long IceLastReceivedSequenceNumber (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern Bool IceSwapping (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern IceErrorHandler IceSetErrorHandler (
#if NeedFunctionPrototypes
IceErrorHandler /* handler */
#endif
);
extern IceIOErrorHandler IceSetIOErrorHandler (
#if NeedFunctionPrototypes
IceIOErrorHandler /* handler */
#endif
);
......@@ -516,21 +414,15 @@ extern IceIOErrorHandler IceSetIOErrorHandler (
*/
extern Status IceInitThreads (
#if NeedFunctionPrototypes
void
#endif
);
extern void IceAppLockConn (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern void IceAppUnlockConn (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
_XFUNCPROTOEND
......
......@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */
#ifndef _ICEMSG_H_
#define _ICEMSG_H_
......@@ -42,65 +42,51 @@ _XFUNCPROTOBEGIN
*/
extern Status _IceRead (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
unsigned long /* nbytes */,
char * /* ptr */
#endif
);
extern void _IceReadSkip (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
unsigned long /* nbytes */
#endif
);
extern void _IceWrite (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
unsigned long /* nbytes */,
char * /* ptr */
#endif
);
extern void _IceErrorBadMinor (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */,
int /* offendingMinor */,
int /* severity */
#endif
);
extern void _IceErrorBadState (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */,
int /* offendingMinor */,
int /* severity */
#endif
);
extern void _IceErrorBadLength (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */,
int /* offendingMinor */,
int /* severity */
#endif
);
extern void _IceErrorBadValue (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */,
int /* offendingMinor */,
int /* offset */,
int /* length */,
IcePointer /* value */
#endif
);
......
......@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */
#ifndef _ICEUTIL_H_
#define _ICEUTIL_H_
......@@ -80,64 +80,46 @@ typedef struct {
*/
extern char *IceAuthFileName (
#if NeedFunctionPrototypes
void
#endif
);
extern int IceLockAuthFile (
#if NeedFunctionPrototypes
char * /* file_name */,
int /* retries */,
int /* timeout */,
long /* dead */
#endif
);
extern void IceUnlockAuthFile (
#if NeedFunctionPrototypes
char * /* file_name */
#endif
);
extern IceAuthFileEntry *IceReadAuthFileEntry (
#if NeedFunctionPrototypes
FILE * /* auth_file */
#endif
);
extern void IceFreeAuthFileEntry (
#if NeedFunctionPrototypes
IceAuthFileEntry * /* auth */
#endif
);
extern Status IceWriteAuthFileEntry (
#if NeedFunctionPrototypes
FILE * /* auth_file */,
IceAuthFileEntry * /* auth */
#endif
);
extern IceAuthFileEntry *IceGetAuthFileEntry (
#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* network_id */,
char * /* auth_name */
#endif
);
extern char *IceGenerateMagicCookie (
#if NeedFunctionPrototypes
int /* len */
#endif
);
extern void IceSetPaAuthData (
#if NeedFunctionPrototypes
int /* numEntries */,
IceAuthDataEntry * /* entries */
#endif
);
_XFUNCPROTOEND
......
......@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.6 2001/12/14 19:53:35 dawes Exp $ */
/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.7 2003/11/17 22:20:05 dawes Exp $ */
#ifndef _ICELIBINT_H_
#define _ICELIBINT_H_
......@@ -127,7 +127,6 @@ struct _IceListenObj {
*/
typedef void (*_IceProcessCoreMsgProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* opcode */,
unsigned long /* length */,
......@@ -135,7 +134,6 @@ typedef void (*_IceProcessCoreMsgProc) (
IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */,
Bool * /* connectionClosedRet */
#endif
);
typedef struct {
......@@ -411,173 +409,129 @@ extern IceIOErrorHandler _IceIOErrorHandler;
extern void _IceErrorBadMajor (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMajor */,
int /* offendingMinor */,
int /* severity */
#endif
);
extern void _IceErrorNoAuthentication (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */
#endif
);
extern void _IceErrorNoVersion (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */
#endif
);
extern void _IceErrorSetupFailed (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */,
char * /* reason */
#endif
);
extern void _IceErrorAuthenticationRejected (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */,
char * /* reason */
#endif
);
extern void _IceErrorAuthenticationFailed (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */,
char * /* reason */
#endif
);
extern void _IceErrorProtocolDuplicate (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
char * /* protocolName */
#endif
);
extern void _IceErrorMajorOpcodeDuplicate (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */
#endif
);
extern void _IceErrorUnknownProtocol (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
char * /* protocolName */
#endif
);
extern void _IceAddOpcodeMapping (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* hisOpcode */,
int /* myOpcode */
#endif
);
extern char *_IceGetPeerName (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern void _IceFreeConnection (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern void _IceAddReplyWait (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */
#endif
);
extern IceReplyWaitInfo *_IceSearchReplyWaits (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */
#endif
);
extern void _IceSetReplyReady (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */
#endif
);
extern Bool _IceCheckReplyReady (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */
#endif
);
extern void _IceConnectionOpened (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern void _IceConnectionClosed (
#if NeedFunctionPrototypes
IceConn /* iceConn */
#endif
);
extern void _IceGetPoAuthData (
#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
char * /* auth_name */,
unsigned short * /* auth_data_length_ret */,
char ** /* auth_data_ret */
#endif
);
extern void _IceGetPaAuthData (
#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
char * /* auth_name */,
unsigned short * /* auth_data_length_ret */,
char ** /* auth_data_ret */
#endif
);
extern void _IceGetPoValidAuthIndices (
#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
int /* num_auth_names */,
char ** /* auth_names */,
int * /* num_indices_ret */,
int * /* indices_ret */
#endif
);
extern void _IceGetPaValidAuthIndices (
#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
int /* num_auth_names */,
char ** /* auth_names */,
int * /* num_indices_ret */,
int * /* indices_ret */
#endif
);
#endif /* _ICELIBINT_H_ */
......@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
/* $XFree86: xc/lib/ICE/process.c,v 3.8 2001/12/14 19:53:36 dawes Exp $ */
/* $XFree86: xc/lib/ICE/process.c,v 3.10 2003/10/23 21:31:49 tsi Exp $ */
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
......@@ -37,11 +37,11 @@ Author: Ralph Mor, X Consortium
* Check for bad length
*/
#define CHECK_SIZE_MATCH(_iceConn, _opcode, _expected_len, _actual_len, _severity) \
#define CHECK_SIZE_MATCH(_iceConn, _opcode, _expected_len, _actual_len, _severity, _return) \
if ((((_actual_len) - SIZEOF (iceMsg)) >> 3) != _expected_len) \
{ \
_IceErrorBadLength (_iceConn, 0, _opcode, _severity); \