...
 
Commits (5)
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */
#ifndef _ICELIB_H_ #ifndef _ICELIB_H_
#define _ICELIB_H_ #define _ICELIB_H_
...@@ -38,11 +39,7 @@ Author: Ralph Mor, X Consortium ...@@ -38,11 +39,7 @@ Author: Ralph Mor, X Consortium
#define True 1 #define True 1
#define False 0 #define False 0
#if NeedFunctionPrototypes
typedef void *IcePointer; typedef void *IcePointer;
#else
typedef char *IcePointer;
#endif
typedef enum { typedef enum {
IcePoAuthHaveReply, IcePoAuthHaveReply,
...@@ -102,16 +99,13 @@ typedef struct _IceConn *IceConn; ...@@ -102,16 +99,13 @@ typedef struct _IceConn *IceConn;
typedef struct _IceListenObj *IceListenObj; typedef struct _IceListenObj *IceListenObj;
typedef void (*IceWatchProc) ( typedef void (*IceWatchProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer /* clientData */, IcePointer /* clientData */,
Bool /* opening */, Bool /* opening */,
IcePointer * /* watchData */ IcePointer * /* watchData */
#endif
); );
typedef void (*IcePoProcessMsgProc) ( typedef void (*IcePoProcessMsgProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer /* clientData */, IcePointer /* clientData */,
int /* opcode */, int /* opcode */,
...@@ -119,17 +113,14 @@ typedef void (*IcePoProcessMsgProc) ( ...@@ -119,17 +113,14 @@ typedef void (*IcePoProcessMsgProc) (
Bool /* swap */, Bool /* swap */,
IceReplyWaitInfo * /* replyWait */, IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */ Bool * /* replyReadyRet */
#endif
); );
typedef void (*IcePaProcessMsgProc) ( typedef void (*IcePaProcessMsgProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer /* clientData */, IcePointer /* clientData */,
int /* opcode */, int /* opcode */,
unsigned long /* length */, unsigned long /* length */,
Bool /* swap */ Bool /* swap */
#endif
); );
typedef struct { typedef struct {
...@@ -145,7 +136,6 @@ typedef struct { ...@@ -145,7 +136,6 @@ typedef struct {
} IcePaVersionRec; } IcePaVersionRec;
typedef IcePoAuthStatus (*IcePoAuthProc) ( typedef IcePoAuthStatus (*IcePoAuthProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer * /* authStatePtr */, IcePointer * /* authStatePtr */,
Bool /* cleanUp */, Bool /* cleanUp */,
...@@ -155,11 +145,9 @@ typedef IcePoAuthStatus (*IcePoAuthProc) ( ...@@ -155,11 +145,9 @@ typedef IcePoAuthStatus (*IcePoAuthProc) (
int * /* replyDataLenRet */, int * /* replyDataLenRet */,
IcePointer * /* replyDataRet */, IcePointer * /* replyDataRet */,
char ** /* errorStringRet */ char ** /* errorStringRet */
#endif
); );
typedef IcePaAuthStatus (*IcePaAuthProc) ( typedef IcePaAuthStatus (*IcePaAuthProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer * /* authStatePtr */, IcePointer * /* authStatePtr */,
Bool /* swap */, Bool /* swap */,
...@@ -168,17 +156,13 @@ typedef IcePaAuthStatus (*IcePaAuthProc) ( ...@@ -168,17 +156,13 @@ typedef IcePaAuthStatus (*IcePaAuthProc) (
int * /* replyDataLenRet */, int * /* replyDataLenRet */,
IcePointer * /* replyDataRet */, IcePointer * /* replyDataRet */,
char ** /* errorStringRet */ char ** /* errorStringRet */
#endif
); );
typedef Bool (*IceHostBasedAuthProc) ( typedef Bool (*IceHostBasedAuthProc) (
#if NeedFunctionPrototypes
char * /* hostName */ char * /* hostName */
#endif
); );
typedef Status (*IceProtocolSetupProc) ( typedef Status (*IceProtocolSetupProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorVersion */, int /* majorVersion */,
int /* minorVersion */, int /* minorVersion */,
...@@ -186,31 +170,23 @@ typedef Status (*IceProtocolSetupProc) ( ...@@ -186,31 +170,23 @@ typedef Status (*IceProtocolSetupProc) (
char * /* release */, char * /* release */,
IcePointer * /* clientDataRet */, IcePointer * /* clientDataRet */,
char ** /* failureReasonRet */ char ** /* failureReasonRet */
#endif
); );
typedef void (*IceProtocolActivateProc) ( typedef void (*IceProtocolActivateProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer /* clientData */ IcePointer /* clientData */
#endif
); );
typedef void (*IceIOErrorProc) ( typedef void (*IceIOErrorProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
typedef void (*IcePingReplyProc) ( typedef void (*IcePingReplyProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePointer /* clientData */ IcePointer /* clientData */
#endif
); );
typedef void (*IceErrorHandler) ( typedef void (*IceErrorHandler) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
Bool /* swap */, Bool /* swap */,
int /* offendingMinorOpcode */, int /* offendingMinorOpcode */,
...@@ -218,13 +194,10 @@ typedef void (*IceErrorHandler) ( ...@@ -218,13 +194,10 @@ typedef void (*IceErrorHandler) (
int /* errorClass */, int /* errorClass */,
int /* severity */, int /* severity */,
IcePointer /* values */ IcePointer /* values */
#endif
); );
typedef void (*IceIOErrorHandler) ( typedef void (*IceIOErrorHandler) (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
...@@ -235,7 +208,6 @@ typedef void (*IceIOErrorHandler) ( ...@@ -235,7 +208,6 @@ typedef void (*IceIOErrorHandler) (
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
extern int IceRegisterForProtocolSetup ( extern int IceRegisterForProtocolSetup (
#if NeedFunctionPrototypes
char * /* protocolName */, char * /* protocolName */,
char * /* vendor */, char * /* vendor */,
char * /* release */, char * /* release */,
...@@ -245,11 +217,9 @@ extern int IceRegisterForProtocolSetup ( ...@@ -245,11 +217,9 @@ extern int IceRegisterForProtocolSetup (
char ** /* authNames */, char ** /* authNames */,
IcePoAuthProc * /* authProcs */, IcePoAuthProc * /* authProcs */,
IceIOErrorProc /* IOErrorProc */ IceIOErrorProc /* IOErrorProc */
#endif
); );
extern int IceRegisterForProtocolReply ( extern int IceRegisterForProtocolReply (
#if NeedFunctionPrototypes
char * /* protocolName */, char * /* protocolName */,
char * /* vendor */, char * /* vendor */,
char * /* release */, char * /* release */,
...@@ -262,120 +232,88 @@ extern int IceRegisterForProtocolReply ( ...@@ -262,120 +232,88 @@ extern int IceRegisterForProtocolReply (
IceProtocolSetupProc /* protocolSetupProc */, IceProtocolSetupProc /* protocolSetupProc */,
IceProtocolActivateProc /* protocolActivateProc */, IceProtocolActivateProc /* protocolActivateProc */,
IceIOErrorProc /* IOErrorProc */ IceIOErrorProc /* IOErrorProc */
#endif
); );
extern IceConn IceOpenConnection ( extern IceConn IceOpenConnection (
#if NeedFunctionPrototypes
char * /* networkIdsList */, char * /* networkIdsList */,
IcePointer /* context */, IcePointer /* context */,
Bool /* mustAuthenticate */, Bool /* mustAuthenticate */,
int /* majorOpcodeCheck */, int /* majorOpcodeCheck */,
int /* errorLength */, int /* errorLength */,
char * /* errorStringRet */ char * /* errorStringRet */
#endif
); );
extern IcePointer IceGetConnectionContext ( extern IcePointer IceGetConnectionContext (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern Status IceListenForConnections ( extern Status IceListenForConnections (
#if NeedFunctionPrototypes
int * /* countRet */, int * /* countRet */,
IceListenObj ** /* listenObjsRet */, IceListenObj ** /* listenObjsRet */,
int /* errorLength */, int /* errorLength */,
char * /* errorStringRet */ char * /* errorStringRet */
#endif
); );
extern Status IceListenForWellKnownConnections ( extern Status IceListenForWellKnownConnections (
#if NeedFunctionPrototypes
char * /* port */, char * /* port */,
int * /* countRet */, int * /* countRet */,
IceListenObj ** /* listenObjsRet */, IceListenObj ** /* listenObjsRet */,
int /* errorLength */, int /* errorLength */,
char * /* errorStringRet */ char * /* errorStringRet */
#endif
); );
extern int IceGetListenConnectionNumber ( extern int IceGetListenConnectionNumber (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */ IceListenObj /* listenObj */
#endif
); );
extern char *IceGetListenConnectionString ( extern char *IceGetListenConnectionString (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */ IceListenObj /* listenObj */
#endif
); );
extern char *IceComposeNetworkIdList ( extern char *IceComposeNetworkIdList (
#if NeedFunctionPrototypes
int /* count */, int /* count */,
IceListenObj * /* listenObjs */ IceListenObj * /* listenObjs */
#endif
); );
extern void IceFreeListenObjs ( extern void IceFreeListenObjs (
#if NeedFunctionPrototypes
int /* count */, int /* count */,
IceListenObj * /* listenObjs */ IceListenObj * /* listenObjs */
#endif
); );
extern void IceSetHostBasedAuthProc ( extern void IceSetHostBasedAuthProc (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */, IceListenObj /* listenObj */,
IceHostBasedAuthProc /* hostBasedAuthProc */ IceHostBasedAuthProc /* hostBasedAuthProc */
#endif
); );
extern IceConn IceAcceptConnection ( extern IceConn IceAcceptConnection (
#if NeedFunctionPrototypes
IceListenObj /* listenObj */, IceListenObj /* listenObj */,
IceAcceptStatus * /* statusRet */ IceAcceptStatus * /* statusRet */
#endif
); );
extern void IceSetShutdownNegotiation ( extern void IceSetShutdownNegotiation (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
Bool /* negotiate */ Bool /* negotiate */
#endif
); );
extern Bool IceCheckShutdownNegotiation ( extern Bool IceCheckShutdownNegotiation (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern IceCloseStatus IceCloseConnection ( extern IceCloseStatus IceCloseConnection (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern Status IceAddConnectionWatch ( extern Status IceAddConnectionWatch (
#if NeedFunctionPrototypes
IceWatchProc /* watchProc */, IceWatchProc /* watchProc */,
IcePointer /* clientData */ IcePointer /* clientData */
#endif
); );
extern void IceRemoveConnectionWatch ( extern void IceRemoveConnectionWatch (
#if NeedFunctionPrototypes
IceWatchProc /* watchProc */, IceWatchProc /* watchProc */,
IcePointer /* clientData */ IcePointer /* clientData */
#endif
); );
extern IceProtocolSetupStatus IceProtocolSetup ( extern IceProtocolSetupStatus IceProtocolSetup (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* myOpcode */, int /* myOpcode */,
IcePointer /* clientData */, IcePointer /* clientData */,
...@@ -386,127 +324,88 @@ extern IceProtocolSetupStatus IceProtocolSetup ( ...@@ -386,127 +324,88 @@ extern IceProtocolSetupStatus IceProtocolSetup (
char ** /* releaseRet */, char ** /* releaseRet */,
int /* errorLength */, int /* errorLength */,
char * /* errorStringRet */ char * /* errorStringRet */
#endif
); );
extern Status IceProtocolShutdown ( extern Status IceProtocolShutdown (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */ int /* majorOpcode */
#endif
); );
extern IceProcessMessagesStatus IceProcessMessages ( extern IceProcessMessagesStatus IceProcessMessages (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */, IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */ Bool * /* replyReadyRet */
#endif
); );
extern Status IcePing ( extern Status IcePing (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IcePingReplyProc /* pingReplyProc */, IcePingReplyProc /* pingReplyProc */,
IcePointer /* clientData */ IcePointer /* clientData */
#endif
); );
extern char *IceAllocScratch ( extern char *IceAllocScratch (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
unsigned long /* size */ unsigned long /* size */
#endif
); );
extern int IceFlush ( extern int IceFlush (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern int IceGetOutBufSize ( extern int IceGetOutBufSize (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern int IceGetInBufSize ( extern int IceGetInBufSize (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern IceConnectStatus IceConnectionStatus ( extern IceConnectStatus IceConnectionStatus (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern char *IceVendor ( extern char *IceVendor (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern char *IceRelease ( extern char *IceRelease (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern int IceProtocolVersion ( extern int IceProtocolVersion (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern int IceProtocolRevision ( extern int IceProtocolRevision (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern int IceConnectionNumber ( extern int IceConnectionNumber (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern char *IceConnectionString ( extern char *IceConnectionString (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern unsigned long IceLastSentSequenceNumber ( extern unsigned long IceLastSentSequenceNumber (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern unsigned long IceLastReceivedSequenceNumber ( extern unsigned long IceLastReceivedSequenceNumber (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern Bool IceSwapping ( extern Bool IceSwapping (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern IceErrorHandler IceSetErrorHandler ( extern IceErrorHandler IceSetErrorHandler (
#if NeedFunctionPrototypes
IceErrorHandler /* handler */ IceErrorHandler /* handler */
#endif
); );
extern IceIOErrorHandler IceSetIOErrorHandler ( extern IceIOErrorHandler IceSetIOErrorHandler (
#if NeedFunctionPrototypes
IceIOErrorHandler /* handler */ IceIOErrorHandler /* handler */
#endif
); );
...@@ -515,21 +414,15 @@ extern IceIOErrorHandler IceSetIOErrorHandler ( ...@@ -515,21 +414,15 @@ extern IceIOErrorHandler IceSetIOErrorHandler (
*/ */
extern Status IceInitThreads ( extern Status IceInitThreads (
#if NeedFunctionPrototypes
void void
#endif
); );
extern void IceAppLockConn ( extern void IceAppLockConn (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern void IceAppUnlockConn ( extern void IceAppUnlockConn (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
_XFUNCPROTOEND _XFUNCPROTOEND
......
...@@ -26,76 +26,67 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,76 +26,67 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _ICEMSG_H_ #ifndef _ICEMSG_H_
#define _ICEMSG_H_ #define _ICEMSG_H_
#include <X11/Xfuncproto.h>
#include <X11/ICE/ICEconn.h> #include <X11/ICE/ICEconn.h>
_XFUNCPROTOBEGIN
/* /*
* Function prototypes for internal ICElib functions * Function prototypes for internal ICElib functions
*/ */
extern Status _IceRead ( extern Status _IceRead (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
unsigned long /* nbytes */, unsigned long /* nbytes */,
char * /* ptr */ char * /* ptr */
#endif
); );
extern void _IceReadSkip ( extern void _IceReadSkip (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
unsigned long /* nbytes */ unsigned long /* nbytes */
#endif
); );
extern void _IceWrite ( extern void _IceWrite (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
unsigned long /* nbytes */, unsigned long /* nbytes */,
char * /* ptr */ char * /* ptr */
#endif
); );
extern void _IceErrorBadMinor ( extern void _IceErrorBadMinor (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */, int /* majorOpcode */,
int /* offendingMinor */, int /* offendingMinor */,
int /* severity */ int /* severity */
#endif
); );
extern void _IceErrorBadState ( extern void _IceErrorBadState (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */, int /* majorOpcode */,
int /* offendingMinor */, int /* offendingMinor */,
int /* severity */ int /* severity */
#endif
); );
extern void _IceErrorBadLength ( extern void _IceErrorBadLength (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */, int /* majorOpcode */,
int /* offendingMinor */, int /* offendingMinor */,
int /* severity */ int /* severity */
#endif
); );
extern void _IceErrorBadValue ( extern void _IceErrorBadValue (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */, int /* majorOpcode */,
int /* offendingMinor */, int /* offendingMinor */,
int /* offset */, int /* offset */,
int /* length */, int /* length */,
IcePointer /* value */ IcePointer /* value */
#endif
); );
...@@ -299,4 +290,6 @@ extern void _IceErrorBadValue ( ...@@ -299,4 +290,6 @@ extern void _IceErrorBadValue (
_IceRead (_iceConn, (unsigned long) (_bytes), _dummy); \ _IceRead (_iceConn, (unsigned long) (_bytes), _dummy); \
} }
_XFUNCPROTOEND
#endif /* _ICEMSG_H_ */ #endif /* _ICEMSG_H_ */
...@@ -26,13 +26,18 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,13 +26,18 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _ICEUTIL_H_ #ifndef _ICEUTIL_H_
#define _ICEUTIL_H_ #define _ICEUTIL_H_
#include <X11/Xfuncproto.h>
#include <stdio.h> #include <stdio.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
_XFUNCPROTOBEGIN
/* /*
* Data structure for entry in ICE authority file * Data structure for entry in ICE authority file
*/ */
...@@ -75,64 +80,48 @@ typedef struct { ...@@ -75,64 +80,48 @@ typedef struct {
*/ */
extern char *IceAuthFileName ( extern char *IceAuthFileName (
#if NeedFunctionPrototypes
void void
#endif
); );
extern int IceLockAuthFile ( extern int IceLockAuthFile (
#if NeedFunctionPrototypes
char * /* file_name */, char * /* file_name */,
int /* retries */, int /* retries */,
int /* timeout */, int /* timeout */,
long /* dead */ long /* dead */
#endif
); );
extern void IceUnlockAuthFile ( extern void IceUnlockAuthFile (
#if NeedFunctionPrototypes
char * /* file_name */ char * /* file_name */
#endif
); );
extern IceAuthFileEntry *IceReadAuthFileEntry ( extern IceAuthFileEntry *IceReadAuthFileEntry (
#if NeedFunctionPrototypes
FILE * /* auth_file */ FILE * /* auth_file */
#endif
); );
extern void IceFreeAuthFileEntry ( extern void IceFreeAuthFileEntry (
#if NeedFunctionPrototypes
IceAuthFileEntry * /* auth */ IceAuthFileEntry * /* auth */
#endif
); );
extern Status IceWriteAuthFileEntry ( extern Status IceWriteAuthFileEntry (
#if NeedFunctionPrototypes
FILE * /* auth_file */, FILE * /* auth_file */,
IceAuthFileEntry * /* auth */ IceAuthFileEntry * /* auth */
#endif
); );
extern IceAuthFileEntry *IceGetAuthFileEntry ( extern IceAuthFileEntry *IceGetAuthFileEntry (
#if NeedFunctionPrototypes
char * /* protocol_name */, char * /* protocol_name */,
char * /* network_id */, char * /* network_id */,
char * /* auth_name */ char * /* auth_name */
#endif
); );
extern char *IceGenerateMagicCookie ( extern char *IceGenerateMagicCookie (
#if NeedFunctionPrototypes
int /* len */ int /* len */
#endif
); );
extern void IceSetPaAuthData ( extern void IceSetPaAuthData (
#if NeedFunctionPrototypes
int /* numEntries */, int /* numEntries */,
IceAuthDataEntry * /* entries */ IceAuthDataEntry * /* entries */
#endif
); );
_XFUNCPROTOEND
#endif /* _ICEUTIL_H_ */ #endif /* _ICEUTIL_H_ */
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.6 2001/12/14 19:53:35 dawes Exp $ */
#ifndef _ICELIBINT_H_ #ifndef _ICELIBINT_H_
#define _ICELIBINT_H_ #define _ICELIBINT_H_
...@@ -37,15 +38,8 @@ Author: Ralph Mor, X Consortium ...@@ -37,15 +38,8 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEconn.h> #include <X11/ICE/ICEconn.h>
#include <X11/ICE/ICEmsg.h> #include <X11/ICE/ICEmsg.h>
#ifndef X_NOT_STDC_ENV
#include <stdlib.h> #include <stdlib.h>
#else #include <stddef.h>
char *malloc();
#endif
#ifndef NULL
#define NULL 0
#endif
/* /*
...@@ -133,7 +127,6 @@ struct _IceListenObj { ...@@ -133,7 +127,6 @@ struct _IceListenObj {
*/ */
typedef void (*_IceProcessCoreMsgProc) ( typedef void (*_IceProcessCoreMsgProc) (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* opcode */, int /* opcode */,
unsigned long /* length */, unsigned long /* length */,
...@@ -141,7 +134,6 @@ typedef void (*_IceProcessCoreMsgProc) ( ...@@ -141,7 +134,6 @@ typedef void (*_IceProcessCoreMsgProc) (
IceReplyWaitInfo * /* replyWait */, IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */, Bool * /* replyReadyRet */,
Bool * /* connectionClosedRet */ Bool * /* connectionClosedRet */
#endif
); );
typedef struct { typedef struct {
...@@ -287,20 +279,21 @@ typedef struct { ...@@ -287,20 +279,21 @@ typedef struct {
} }
#define SKIP_STRING(_pBuf, _swap) \ #define SKIP_STRING(_pBuf, _swap, _end, _bail) \
{ \ { \
CARD16 _len; \ CARD16 _len; \
EXTRACT_CARD16 (_pBuf, _swap, _len); \ EXTRACT_CARD16 (_pBuf, _swap, _len); \
_pBuf += _len; \ _pBuf += _len + PAD32(2+_len); \
if (PAD32 (2 + _len)) \ if (_pBuf > _end) { \
_pBuf += PAD32 (2 + _len); \ _bail; \
} } \
}
#define SKIP_LISTOF_STRING(_pBuf, _swap, _count) \ #define SKIP_LISTOF_STRING(_pBuf, _swap, _count, _end, _bail) \
{ \ { \
int _i; \ int _i; \
for (_i = 0; _i < _count; _i++) \ for (_i = 0; _i < _count; _i++) \
SKIP_STRING (_pBuf, _swap); \ SKIP_STRING (_pBuf, _swap, _end, _bail); \
} }
...@@ -416,173 +409,129 @@ extern IceIOErrorHandler _IceIOErrorHandler; ...@@ -416,173 +409,129 @@ extern IceIOErrorHandler _IceIOErrorHandler;
extern void _IceErrorBadMajor ( extern void _IceErrorBadMajor (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* offendingMajor */, int /* offendingMajor */,
int /* offendingMinor */, int /* offendingMinor */,
int /* severity */ int /* severity */
#endif
); );
extern void _IceErrorNoAuthentication ( extern void _IceErrorNoAuthentication (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* offendingMinor */ int /* offendingMinor */
#endif
); );
extern void _IceErrorNoVersion ( extern void _IceErrorNoVersion (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* offendingMinor */ int /* offendingMinor */
#endif
); );
extern void _IceErrorSetupFailed ( extern void _IceErrorSetupFailed (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* offendingMinor */, int /* offendingMinor */,
char * /* reason */ char * /* reason */
#endif
); );
extern void _IceErrorAuthenticationRejected ( extern void _IceErrorAuthenticationRejected (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* offendingMinor */, int /* offendingMinor */,
char * /* reason */ char * /* reason */
#endif
); );
extern void _IceErrorAuthenticationFailed ( extern void _IceErrorAuthenticationFailed (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* offendingMinor */, int /* offendingMinor */,
char * /* reason */ char * /* reason */
#endif
); );
extern void _IceErrorProtocolDuplicate ( extern void _IceErrorProtocolDuplicate (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
char * /* protocolName */ char * /* protocolName */
#endif
); );
extern void _IceErrorMajorOpcodeDuplicate ( extern void _IceErrorMajorOpcodeDuplicate (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */ int /* majorOpcode */
#endif
); );
extern void _IceErrorUnknownProtocol ( extern void _IceErrorUnknownProtocol (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
char * /* protocolName */ char * /* protocolName */
#endif
); );
extern void _IceAddOpcodeMapping ( extern void _IceAddOpcodeMapping (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* hisOpcode */, int /* hisOpcode */,
int /* myOpcode */ int /* myOpcode */
#endif
); );
extern char *_IceGetPeerName ( extern char *_IceGetPeerName (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern void _IceFreeConnection ( extern void _IceFreeConnection (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern void _IceAddReplyWait ( extern void _IceAddReplyWait (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */ IceReplyWaitInfo * /* replyWait */
#endif
); );
extern IceReplyWaitInfo *_IceSearchReplyWaits ( extern IceReplyWaitInfo *_IceSearchReplyWaits (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
int /* majorOpcode */ int /* majorOpcode */
#endif
); );
extern void _IceSetReplyReady ( extern void _IceSetReplyReady (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */ IceReplyWaitInfo * /* replyWait */
#endif
); );
extern Bool _IceCheckReplyReady ( extern Bool _IceCheckReplyReady (
#if NeedFunctionPrototypes
IceConn /* iceConn */, IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */ IceReplyWaitInfo * /* replyWait */
#endif
); );
extern void _IceConnectionOpened ( extern void _IceConnectionOpened (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern void _IceConnectionClosed ( extern void _IceConnectionClosed (
#if NeedFunctionPrototypes
IceConn /* iceConn */ IceConn /* iceConn */
#endif
); );
extern void _IceGetPoAuthData ( extern void _IceGetPoAuthData (
#if NeedFunctionPrototypes
char * /* protocol_name */, char * /* protocol_name */,
char * /* address */, char * /* address */,
char * /* auth_name */, char * /* auth_name */,
unsigned short * /* auth_data_length_ret */, unsigned short * /* auth_data_length_ret */,
char ** /* auth_data_ret */ char ** /* auth_data_ret */
#endif
); );
extern void _IceGetPaAuthData ( extern void _IceGetPaAuthData (
#if NeedFunctionPrototypes
char * /* protocol_name */, char * /* protocol_name */,
char * /* address */, char * /* address */,
char * /* auth_name */, char * /* auth_name */,
unsigned short * /* auth_data_length_ret */, unsigned short * /* auth_data_length_ret */,
char ** /* auth_data_ret */ char ** /* auth_data_ret */
#endif
); );
extern void _IceGetPoValidAuthIndices ( extern void _IceGetPoValidAuthIndices (
#if NeedFunctionPrototypes
char * /* protocol_name */, char * /* protocol_name */,
char * /* address */, char * /* address */,
int /* num_auth_names */, int /* num_auth_names */,
char ** /* auth_names */, char ** /* auth_names */,
int * /* num_indices_ret */, int * /* num_indices_ret */,
int * /* indices_ret */ int * /* indices_ret */
#endif
); );
extern void _IceGetPaValidAuthIndices ( extern void _IceGetPaValidAuthIndices (
#if NeedFunctionPrototypes
char * /* protocol_name */, char * /* protocol_name */,
char * /* address */, char * /* address */,
int /* num_auth_names */, int /* num_auth_names */,
char ** /* auth_names */, char ** /* auth_names */,
int * /* num_indices_ret */, int * /* num_indices_ret */,
int * /* indices_ret */ int * /* indices_ret */
#endif
); );
#endif /* _ICELIBINT_H_ */ #endif /* _ICELIBINT_H_ */
/* $Xorg: authutil.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /* $Xorg: authutil.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
/* $XdotOrg: xc/lib/ICE/authutil.c,v 1.2 2004/04/23 18:43:22 eich Exp $ */
/****************************************************************************** /******************************************************************************
...@@ -26,6 +27,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: authutil.c,v 3.9 2002/05/31 18:45:41 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -34,14 +36,11 @@ Author: Ralph Mor, X Consortium ...@@ -34,14 +36,11 @@ Author: Ralph Mor, X Consortium
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#ifdef X_NOT_STDC_ENV
extern int errno;
extern long time ();
extern char *getenv();
#define Time_t long
#else
#include <time.h> #include <time.h>
#define Time_t time_t #define Time_t time_t
#ifdef __UNIXOS2__
extern char* getenv(const char*);
#define link rename
#endif #endif
#ifndef X_NOT_POSIX #ifndef X_NOT_POSIX
#include <unistd.h> #include <unistd.h>
...@@ -77,7 +76,7 @@ IceAuthFileName () ...@@ -77,7 +76,7 @@ IceAuthFileName ()
static char *buf; static char *buf;
static int bsize; static int bsize;
int size; int size;
#ifdef WIN32 #if defined(WIN32) || defined(__UNIXOS2__)
#ifndef PATH_MAX #ifndef PATH_MAX
#define PATH_MAX 512 #define PATH_MAX 512
#endif #endif
...@@ -108,6 +107,11 @@ IceAuthFileName () ...@@ -108,6 +107,11 @@ IceAuthFileName ()
name = dir; name = dir;
} }
if (!name) if (!name)
#endif
#ifdef __UNIXOS2__
strcpy (dir,"c:");
name = dir;
if (!name)
#endif #endif
return (NULL); return (NULL);
} }
...@@ -415,25 +419,21 @@ char **stringp; ...@@ -415,25 +419,21 @@ char **stringp;
if (!read_short (file, &len)) if (!read_short (file, &len))
return (0); return (0);
if (len == 0) data = malloc ((unsigned) len + 1);
{
data = 0; if (!data)
}
else
{
data = malloc ((unsigned) len + 1);
if (!data)
return (0); return (0);
if (fread (data, (int) sizeof (char), (int) len, file) != len) if (len != 0)
{
if (fread (data, (int) sizeof (char), (int) len, file) != len)
{ {
free (data); free (data);
return (0); return (0);
} }
data[len] = '\0';
} }
data[len] = '\0';
*stringp = data; *stringp = data;
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/connect.c,v 3.9 2001/12/14 19:53:35 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -34,23 +35,7 @@ Author: Ralph Mor, X Consortium ...@@ -34,23 +35,7 @@ Author: Ralph Mor, X Consortium
static XtransConnInfo ConnectToPeer(); static XtransConnInfo ConnectToPeer();
#ifndef X_NOT_STDC_ENV
#define Strstr strstr #define Strstr strstr
#else
static char *Strstr(s1, s2)
char *s1, *s2;
{
int n1, n2;
n1 = strlen(s1);
n2 = strlen(s2);
for ( ; n1 >= n2; s1++, n1--) {
if (!strncmp(s1, s2, n2))
return s1;
}
return NULL;
}
#endif
IceConn IceConn
IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck, IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck,
...@@ -220,7 +205,7 @@ char *errorStringRet; ...@@ -220,7 +205,7 @@ char *errorStringRet;
iceConn->inbufmax = iceConn->inbuf + ICE_INBUFSIZE; iceConn->inbufmax = iceConn->inbuf + ICE_INBUFSIZE;
if ((iceConn->outbuf = iceConn->outbufptr = if ((iceConn->outbuf = iceConn->outbufptr =
(char *) malloc (ICE_OUTBUFSIZE)) == NULL) (char *) calloc (1, ICE_OUTBUFSIZE)) == NULL)
{ {
_IceFreeConnection (iceConn); _IceFreeConnection (iceConn);
strncpy (errorStringRet, "Can't malloc", errorLength); strncpy (errorStringRet, "Can't malloc", errorLength);
...@@ -473,6 +458,7 @@ char **actualConnectionRet; ...@@ -473,6 +458,7 @@ char **actualConnectionRet;
int madeConnection = 0; int madeConnection = 0;
int len, retry; int len, retry;
int connect_stat; int connect_stat;
int address_size;
XtransConnInfo trans_conn = NULL; XtransConnInfo trans_conn = NULL;
*actualConnectionRet = NULL; *actualConnectionRet = NULL;
...@@ -481,8 +467,16 @@ char **actualConnectionRet; ...@@ -481,8 +467,16 @@ char **actualConnectionRet;
len = strlen (networkIdsList); len = strlen (networkIdsList);
endptr = networkIdsList + len; endptr = networkIdsList + len;
if (len < sizeof addrbuf) address = addrbuf; if (len < sizeof addrbuf)
else address = malloc (len + 1); {
address = addrbuf;
address_size = 256;
}
else
{
address = malloc (len + 1);
address_size = len;
}
while (ptr < endptr && !madeConnection) while (ptr < endptr && !madeConnection)
{ {
...@@ -490,6 +484,8 @@ char **actualConnectionRet; ...@@ -490,6 +484,8 @@ char **actualConnectionRet;
delim = endptr; delim = endptr;
len = delim - ptr; len = delim - ptr;
if (len > address_size - 1)
len = address_size - 1;
strncpy (address, ptr, len); strncpy (address, ptr, len);
address[len] = '\0'; address[len] = '\0';
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/error.c,v 1.5 2001/10/28 03:32:28 tsi Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -33,10 +34,6 @@ Author: Ralph Mor, X Consortium ...@@ -33,10 +34,6 @@ Author: Ralph Mor, X Consortium
#include <errno.h> #include <errno.h>
#ifdef X_NOT_STDC_ENV
extern int errno;
#endif
void void
_IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity) _IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity)
...@@ -428,7 +425,7 @@ IcePointer values; ...@@ -428,7 +425,7 @@ IcePointer values;
fprintf (stderr, "ICE error: Offending minor opcode = %d (%s)\n", fprintf (stderr, "ICE error: Offending minor opcode = %d (%s)\n",
offendingMinorOpcode, str); offendingMinorOpcode, str);
fprintf (stderr, " Offending sequence number = %d\n", fprintf (stderr, " Offending sequence number = %lu\n",
offendingSequence); offendingSequence);
switch (errorClass) switch (errorClass)
...@@ -609,8 +606,8 @@ IceConn iceConn; ...@@ -609,8 +606,8 @@ IceConn iceConn;
{ {
fprintf (stderr, fprintf (stderr,
"ICE default IO error handler doing an exit(), pid = %d, errno = %d\n", "ICE default IO error handler doing an exit(), pid = %ld, errno = %d\n",
getpid(), errno); (long)getpid(), errno);
exit (1); exit (1);
} }
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/getauth.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -98,7 +99,7 @@ unsigned short *authDataLenRet; ...@@ -98,7 +99,7 @@ unsigned short *authDataLenRet;
char **authDataRet; char **authDataRet;
{ {
IceAuthDataEntry *entry; IceAuthDataEntry *entry = NULL;
int found = 0; int found = 0;
int i; int i;
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/globals.h,v 1.4 2001/12/14 19:53:35 dawes Exp $ */
extern void _IceDefaultErrorHandler (); extern void _IceDefaultErrorHandler ();
extern void _IceDefaultIOErrorHandler (); extern void _IceDefaultIOErrorHandler ();
...@@ -35,11 +36,17 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc (); ...@@ -35,11 +36,17 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
extern void _IceProcessCoreMessage (); extern void _IceProcessCoreMessage ();
#ifndef __UNIXOS2__
IceConn _IceConnectionObjs[256]; IceConn _IceConnectionObjs[256];
char *_IceConnectionStrings[256]; char *_IceConnectionStrings[256];
_IceProtocol _IceProtocols[255];
#else
IceConn _IceConnectionObjs[256] = {0};
char *_IceConnectionStrings[256] = {0};
_IceProtocol _IceProtocols[255] = {0};
#endif
int _IceConnectionCount = 0; int _IceConnectionCount = 0;
_IceProtocol _IceProtocols[255];
int _IceLastMajorOpcode = 0; int _IceLastMajorOpcode = 0;
int _IceAuthCount = 1; int _IceAuthCount = 1;
......
...@@ -26,18 +26,14 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,18 +26,14 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/iceauth.c,v 3.5 2001/12/14 19:53:36 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
#include <X11/ICE/ICEutil.h> #include <X11/ICE/ICEutil.h>
#ifdef X_NOT_STDC_ENV
#define Time_t long
extern Time_t time ();
#else
#include <time.h> #include <time.h>
#define Time_t time_t #define Time_t time_t
#endif
static int binaryEqual (); static int binaryEqual ();
...@@ -73,8 +69,9 @@ int len; ...@@ -73,8 +69,9 @@ int len;
} }
#else #else
{ {
#ifndef __UNIXOS2__
long time (); long time ();
#endif
ldata[0] = time ((long *) 0); ldata[0] = time ((long *) 0);
ldata[1] = getpid (); ldata[1] = getpid ();
} }
......
...@@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings ...@@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group. in this Software without prior written authorization from The Open Group.
*/ */
/* $XFree86: xc/lib/ICE/listenwk.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */
/* Author: Ralph Mor, X Consortium */ /* Author: Ralph Mor, X Consortium */
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/misc.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */
#ifdef WIN32 #ifdef WIN32
#define _WILLWINSOCK_ #define _WILLWINSOCK_
...@@ -69,8 +70,9 @@ unsigned long size; ...@@ -69,8 +70,9 @@ unsigned long size;
* Output/Input buffer functions * Output/Input buffer functions
*/ */
int
IceFlush (iceConn) IceFlush (iceConn)
IceConn iceConn; IceConn iceConn;
{ {
......
This diff is collapsed.
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/protosetup.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -58,7 +59,7 @@ char *errorStringRet; ...@@ -58,7 +59,7 @@ char *errorStringRet;
unsigned long setup_sequence; unsigned long setup_sequence;
IceReplyWaitInfo replyWait; IceReplyWaitInfo replyWait;
_IceReply reply; _IceReply reply;
IcePoVersionRec *versionRec; IcePoVersionRec *versionRec = NULL;
int authCount; int authCount;
int *authIndices; int *authIndices;
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/setauth.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -48,7 +49,11 @@ Author: Ralph Mor, X Consortium ...@@ -48,7 +49,11 @@ Author: Ralph Mor, X Consortium
*/ */
int _IcePaAuthDataEntryCount = 0; int _IcePaAuthDataEntryCount = 0;
#ifndef __UNIXOS2__
IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES]; IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES];
#else
IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES] = {0};
#endif
void void
......
...@@ -26,9 +26,11 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,9 +26,11 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/shutdown.c,v 3.3 2001/08/01 00:44:37 tsi Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
#include <X11/Xtrans.h>
Status Status
......