Please find attached a patch that makes libICE ANSI C compliant and fixes a few small type related issues flagged by gcc and sparse.
Best Regards, Magnus Kessler
Ansify libICE
Ansify libICE and fix some type issues flagged by sparse and gcc
Signed-off-by: Magnus Kessler <[EMAIL PROTECTED]>
diff --git a/src/ICElibint.h b/src/ICElibint.h
index ca61553..5880241 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -37,6 +37,7 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEproto.h>
#include <X11/ICE/ICEconn.h>
#include <X11/ICE/ICEmsg.h>
+#include <X11/ICE/ICEutil.h>
#ifdef WIN32
#include <X11/Xwindows.h>
#endif
@@ -410,6 +411,9 @@ extern _IceWatchProc *_IceWatchProcs;
extern IceErrorHandler _IceErrorHandler;
extern IceIOErrorHandler _IceIOErrorHandler;
+extern int _IcePaAuthDataEntryCount;
+extern IceAuthDataEntry _IcePaAuthDataEntries[];
+
extern void _IceErrorBadMajor (
IceConn /* iceConn */,
@@ -537,4 +541,51 @@ extern void _IceGetPaValidAuthIndices (
int * /* indices_ret */
);
+extern void _IceDefaultErrorHandler (
+ IceConn /* iceConn*/,
+ Bool /* swap */,
+ int /* offendingMinorOpcode */,
+ unsigned long /* offendingSequence */,
+ int /* errorClass */,
+ int /* severity */,
+ IcePointer /* values */
+);
+
+extern void _IceDefaultIOErrorHandler (
+ IceConn /* iceConn */
+);
+
+extern IcePoAuthStatus _IcePoMagicCookie1Proc (
+ IceConn /* iceConn */,
+ IcePointer * /* authStatePtr */,
+ Bool /* cleanUp */,
+ Bool /* swap */,
+ int /* authDataLen */,
+ IcePointer /* authData */,
+ int * /* replyDataLenRet */,
+ IcePointer * /* replyDataRet */,
+ char ** /* errorStringRet */
+);
+
+extern IcePaAuthStatus _IcePaMagicCookie1Proc(
+ IceConn /* iceConn */,
+ IcePointer * /* authStatePtr */,
+ Bool /* swap */,
+ int /* authDataLen */,
+ IcePointer /* authData */,
+ int * /* replyDataLenRet */,
+ IcePointer * /* replyDataRet */,
+ char ** /* errorStringRet */
+);
+
+extern void _IceProcessCoreMessage(
+ IceConn /* iceConn */,
+ int /* opcode */,
+ unsigned long /* length */,
+ Bool /* swap */,
+ IceReplyWaitInfo * /* replyWait */,
+ Bool * /* replyReadyRet */,
+ Bool * /* connectionClosedRet */
+);
+
#endif /* _ICELIBINT_H_ */
diff --git a/src/accept.c b/src/accept.c
index d54ffd4..e883029 100644
--- a/src/accept.c
+++ b/src/accept.c
@@ -36,11 +36,7 @@ Author: Ralph Mor, X Consortium
IceConn
-IceAcceptConnection (listenObj, statusRet)
-
-IceListenObj listenObj;
-IceAcceptStatus *statusRet;
-
+IceAcceptConnection (IceListenObj listenObj, IceAcceptStatus *statusRet)
{
IceConn iceConn;
XtransConnInfo newconn;
@@ -51,7 +47,7 @@ IceAcceptStatus *statusRet;
* Accept the connection.
*/
- if ((newconn = _IceTransAccept (listenObj->trans_conn, &status)) == 0)
+ if ((newconn = _IceTransAccept (listenObj->trans_conn, &status)) == NULL)
{
if (status == TRANS_ACCEPT_BAD_MALLOC)
*statusRet = IceAcceptBadMalloc;
diff --git a/src/authutil.c b/src/authutil.c
index 9cb3deb..3bfa324 100755
--- a/src/authutil.c
+++ b/src/authutil.c
@@ -72,7 +72,6 @@ static Status write_counted_string (FILE *file, unsigned short count, char *stri
char *
IceAuthFileName (void)
-
{
static char slashDotICEauthority[] = "/.ICEauthority";
char *name;
@@ -138,15 +137,8 @@ IceAuthFileName (void)
}
-
int
-IceLockAuthFile (file_name, retries, timeout, dead)
-
-char *file_name;
-int retries;
-int timeout;
-long dead;
-
+IceLockAuthFile (char *file_name, int retries, int timeout, long dead)
{
char creat_name[1025], link_name[1025];
struct stat statb;
@@ -215,12 +207,8 @@ long dead;
}
-
void
-IceUnlockAuthFile (file_name)
-
-char *file_name;
-
+IceUnlockAuthFile (char *file_name)
{
#ifndef WIN32
char creat_name[1025];
@@ -244,12 +232,8 @@ char *file_name;
}
-
IceAuthFileEntry *
-IceReadAuthFileEntry (auth_file)
-
-FILE *auth_file;
-
+IceReadAuthFileEntry (FILE *auth_file)
{
IceAuthFileEntry local;
IceAuthFileEntry *ret;
@@ -296,12 +280,8 @@ FILE *auth_file;
}
-
void
-IceFreeAuthFileEntry (auth)
-
-IceAuthFileEntry *auth;
-
+IceFreeAuthFileEntry (IceAuthFileEntry *auth)
{
if (auth)
{
@@ -315,13 +295,8 @@ IceAuthFileEntry *auth;
}
-
Status
-IceWriteAuthFileEntry (auth_file, auth)
-
-FILE *auth_file;
-IceAuthFileEntry *auth;
-
+IceWriteAuthFileEntry (FILE *auth_file, IceAuthFileEntry *auth)
{
if (!write_string (auth_file, auth->protocol_name))
return (0);
@@ -344,14 +319,8 @@ IceAuthFileEntry *auth;
}
-
IceAuthFileEntry *
-IceGetAuthFileEntry (protocol_name, network_id, auth_name)
-
-char *protocol_name;
-char *network_id;
-char *auth_name;
-
+IceGetAuthFileEntry (char *protocol_name, char *network_id, char *auth_name)
{
FILE *auth_file;
char *filename;
@@ -387,7 +356,6 @@ char *auth_name;
}
-
/*
* local routines
*/
@@ -448,7 +416,7 @@ read_counted_string (FILE *file, unsigned short *countp, char **stringp)
if (len == 0)
{
- data = 0;
+ data = NULL;
}
else
{
diff --git a/src/connect.c b/src/connect.c
index 3874058..14d3bd0 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -40,18 +40,15 @@ static XtransConnInfo ConnectToPeer(char *networkIdsList,
char **actualConnectionRet);
#define Strstr strstr
-
-IceConn
-IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck,
- errorLength, errorStringRet)
-
-char *networkIdsList;
-IcePointer context;
-Bool mustAuthenticate;
-int majorOpcodeCheck;
-int errorLength;
-char *errorStringRet;
+IceConn
+IceOpenConnection (
+ char *networkIdsList,
+ IcePointer context,
+ Bool mustAuthenticate,
+ int majorOpcodeCheck,
+ int errorLength,
+ char *errorStringRet)
{
IceConn iceConn;
int extra, i, j;
@@ -430,18 +427,13 @@ char *errorStringRet;
}
-
IcePointer
-IceGetConnectionContext (iceConn)
-
-IceConn iceConn;
-
+IceGetConnectionContext (IceConn iceConn)
{
return (iceConn->context);
}
-
/* ------------------------------------------------------------------------- *
* local routines *
* ------------------------------------------------------------------------- */
diff --git a/src/error.c b/src/error.c
index 8021ad4..91355c8 100644
--- a/src/error.c
+++ b/src/error.c
@@ -40,13 +40,11 @@ Author: Ralph Mor, X Consortium
void
-_IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity)
-
-IceConn iceConn;
-int majorOpcode;
-int offendingMinor;
-int severity;
-
+_IceErrorBadMinor (
+ IceConn iceConn,
+ int majorOpcode,
+ int offendingMinor,
+ int severity)
{
IceErrorHeader (iceConn,
majorOpcode, offendingMinor,
@@ -60,13 +58,11 @@ int severity;
void
-_IceErrorBadState (iceConn, majorOpcode, offendingMinor, severity)
-
-IceConn iceConn;
-int majorOpcode;
-int offendingMinor;
-int severity;
-
+_IceErrorBadState (
+ IceConn iceConn,
+ int majorOpcode,
+ int offendingMinor,
+ int severity)
{
IceErrorHeader (iceConn,
majorOpcode, offendingMinor,
@@ -80,13 +76,11 @@ int severity;
void
-_IceErrorBadLength (iceConn, majorOpcode, offendingMinor, severity)
-
-IceConn iceConn;
-int majorOpcode;
-int offendingMinor;
-int severity;
-
+_IceErrorBadLength (
+ IceConn iceConn,
+ int majorOpcode,
+ int offendingMinor,
+ int severity)
{
IceErrorHeader (iceConn,
majorOpcode, offendingMinor,
@@ -100,15 +94,13 @@ int severity;
void
-_IceErrorBadValue (iceConn, majorOpcode, offendingMinor, offset, length, value)
-
-IceConn iceConn;
-int majorOpcode;
-int offendingMinor;
-int offset;
-int length; /* in bytes */
-IcePointer value;
-
+_IceErrorBadValue (
+ IceConn iceConn,
+ int majorOpcode,
+ int offendingMinor,
+ int offset,
+ int length, /* in bytes */
+ IcePointer value)
{
IceErrorHeader (iceConn,
majorOpcode, offendingMinor,
@@ -129,11 +121,7 @@ IcePointer value;
void
-_IceErrorNoAuthentication (iceConn, offendingMinor)
-
-IceConn iceConn;
-int offendingMinor;
-
+_IceErrorNoAuthentication (IceConn iceConn, int offendingMinor)
{
int severity = (offendingMinor == ICE_ConnectionSetup) ?
IceFatalToConnection : IceFatalToProtocol;
@@ -150,11 +138,7 @@ int offendingMinor;
void
-_IceErrorNoVersion (iceConn, offendingMinor)
-
-IceConn iceConn;
-int offendingMinor;
-
+_IceErrorNoVersion (IceConn iceConn, int offendingMinor)
{
int severity = (offendingMinor == ICE_ConnectionSetup) ?
IceFatalToConnection : IceFatalToProtocol;
@@ -171,12 +155,7 @@ int offendingMinor;
void
-_IceErrorSetupFailed (iceConn, offendingMinor, reason)
-
-IceConn iceConn;
-int offendingMinor;
-char *reason;
-
+_IceErrorSetupFailed (IceConn iceConn, int offendingMinor, char *reason)
{
char *pBuf, *pStart;
int bytes;
@@ -203,12 +182,10 @@ char *reason;
void
-_IceErrorAuthenticationRejected (iceConn, offendingMinor, reason)
-
-IceConn iceConn;
-int offendingMinor;
-char *reason;
-
+_IceErrorAuthenticationRejected (
+ IceConn iceConn,
+ int offendingMinor,
+ char *reason)
{
char *pBuf, *pStart;
int bytes;
@@ -233,12 +210,10 @@ char *reason;
void
-_IceErrorAuthenticationFailed (iceConn, offendingMinor, reason)
-
-IceConn iceConn;
-int offendingMinor;
-char *reason;
-
+_IceErrorAuthenticationFailed (
+ IceConn iceConn,
+ int offendingMinor,
+ char *reason)
{
char *pBuf, *pStart;
int bytes;
@@ -263,11 +238,7 @@ char *reason;
void
-_IceErrorProtocolDuplicate (iceConn, protocolName)
-
-IceConn iceConn;
-char *protocolName;
-
+_IceErrorProtocolDuplicate (IceConn iceConn, char *protocolName)
{
char *pBuf, *pStart;
int bytes;
@@ -292,11 +263,7 @@ char *protocolName;
void
-_IceErrorMajorOpcodeDuplicate (iceConn, majorOpcode)
-
-IceConn iceConn;
-int majorOpcode;
-
+_IceErrorMajorOpcodeDuplicate (IceConn iceConn, int majorOpcode)
{
char mOp = (char) majorOpcode;
@@ -313,11 +280,7 @@ int majorOpcode;
void
-_IceErrorUnknownProtocol (iceConn, protocolName)
-
-IceConn iceConn;
-char *protocolName;
-
+_IceErrorUnknownProtocol (IceConn iceConn, char *protocolName)
{
char *pBuf, *pStart;
int bytes;
@@ -342,13 +305,11 @@ char *protocolName;
void
-_IceErrorBadMajor (iceConn, offendingMajor, offendingMinor, severity)
-
-IceConn iceConn;
-int offendingMajor;
-int offendingMinor;
-int severity;
-
+_IceErrorBadMajor (
+ IceConn iceConn,
+ int offendingMajor,
+ int offendingMinor,
+ int severity)
{
char maj = (char) offendingMajor;
@@ -364,23 +325,19 @@ int severity;
}
-
/*
* Default error handler.
*/
void
-_IceDefaultErrorHandler (iceConn, swap,
- offendingMinorOpcode, offendingSequence, errorClass, severity, values)
-
-IceConn iceConn;
-Bool swap;
-int offendingMinorOpcode;
-unsigned long offendingSequence;
-int errorClass;
-int severity;
-IcePointer values;
-
+_IceDefaultErrorHandler (
+ IceConn iceConn,
+ Bool swap,
+ int offendingMinorOpcode,
+ unsigned long offendingSequence,
+ int errorClass,
+ int severity,
+ IcePointer values)
{
char *str;
char *pData = (char *) values;
@@ -579,7 +536,6 @@ IcePointer values;
}
-
/*
* This procedure sets the ICE error handler to be the specified
* routine. If NULL is passed in the default error handler is restored.
@@ -587,10 +543,7 @@ IcePointer values;
*/
IceErrorHandler
-IceSetErrorHandler (handler)
-
-IceErrorHandler handler;
-
+IceSetErrorHandler (IceErrorHandler handler)
{
IceErrorHandler oldHandler = _IceErrorHandler;
@@ -603,16 +556,12 @@ IceErrorHandler handler;
}
-
/*
* Default IO error handler.
*/
void
-_IceDefaultIOErrorHandler (iceConn)
-
-IceConn iceConn;
-
+_IceDefaultIOErrorHandler (IceConn iceConn)
{
fprintf (stderr,
"ICE default IO error handler doing an exit(), pid = %ld, errno = %d\n",
@@ -622,7 +571,6 @@ IceConn iceConn;
}
-
/*
* This procedure sets the ICE fatal I/O error handler to be the
* specified routine. If NULL is passed in the default error
@@ -631,10 +579,7 @@ IceConn iceConn;
*/
IceIOErrorHandler
-IceSetIOErrorHandler (handler)
-
-IceIOErrorHandler handler;
-
+IceSetIOErrorHandler (IceIOErrorHandler handler)
{
IceIOErrorHandler oldHandler = _IceIOErrorHandler;
diff --git a/src/getauth.c b/src/getauth.c
index 4ad7878..dda5966 100644
--- a/src/getauth.c
+++ b/src/getauth.c
@@ -38,10 +38,6 @@ Author: Ralph Mor, X Consortium
static Bool auth_valid (const char *auth_name, int num_auth_names,
char **auth_names, int *index_ret);
-extern int _IcePaAuthDataEntryCount;
-extern IceAuthDataEntry _IcePaAuthDataEntries[];
-
-
/*
* The functions in this file are not a standard part of ICElib.
*
@@ -60,15 +56,12 @@ extern IceAuthDataEntry _IcePaAuthDataEntries[];
*/
void
-_IceGetPoAuthData (protocolName, networkId, authName,
- authDataLenRet, authDataRet)
-
-char *protocolName;
-char *networkId;
-char *authName;
-unsigned short *authDataLenRet;
-char **authDataRet;
-
+_IceGetPoAuthData (
+ char *protocolName,
+ char *networkId,
+ char *authName,
+ unsigned short *authDataLenRet,
+ char **authDataRet)
{
IceAuthFileEntry *entry;
@@ -91,17 +84,13 @@ char **authDataRet;
}
-
void
-_IceGetPaAuthData (protocolName, networkId, authName,
- authDataLenRet, authDataRet)
-
-char *protocolName;
-char *networkId;
-char *authName;
-unsigned short *authDataLenRet;
-char **authDataRet;
-
+_IceGetPaAuthData (
+ char *protocolName,
+ char *networkId,
+ char *authName,
+ unsigned short *authDataLenRet,
+ char **authDataRet)
{
IceAuthDataEntry *entry = NULL;
int found = 0;
@@ -132,18 +121,14 @@ char **authDataRet;
}
-
void
-_IceGetPoValidAuthIndices (protocol_name, network_id,
- num_auth_names, auth_names, num_indices_ret, indices_ret)
-
-char *protocol_name;
-char *network_id;
-int num_auth_names;
-char **auth_names;
-int *num_indices_ret;
-int *indices_ret; /* in/out arg */
-
+_IceGetPoValidAuthIndices (
+ char *protocol_name,
+ char *network_id,
+ int num_auth_names,
+ char **auth_names,
+ int *num_indices_ret,
+ int *indices_ret /* in/out arg */)
{
FILE *auth_file;
char *filename;
@@ -193,18 +178,14 @@ int *indices_ret; /* in/out arg */
}
-
void
-_IceGetPaValidAuthIndices (protocol_name, network_id,
- num_auth_names, auth_names, num_indices_ret, indices_ret)
-
-char *protocol_name;
-char *network_id;
-int num_auth_names;
-char **auth_names;
-int *num_indices_ret;
-int *indices_ret; /* in/out arg */
-
+_IceGetPaValidAuthIndices (
+ char *protocol_name,
+ char *network_id,
+ int num_auth_names,
+ char **auth_names,
+ int *num_indices_ret,
+ int *indices_ret /* in/out arg */)
{
int index_ret;
int i, j;
diff --git a/src/globals.h b/src/globals.h
index 0532f55..693c90c 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -28,13 +28,7 @@ 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 _IceDefaultIOErrorHandler ();
-
-extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
-extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
-
-extern void _IceProcessCoreMessage ();
+#include "ICElibint.h"
#ifndef __UNIXOS2__
IceConn _IceConnectionObjs[256];
diff --git a/src/iceauth.c b/src/iceauth.c
index dcee7ed..b5a234c 100644
--- a/src/iceauth.c
+++ b/src/iceauth.c
@@ -47,12 +47,9 @@ static int was_called_state;
* the SI. It is not part of standard ICElib.
*/
-
-char *
-IceGenerateMagicCookie (len)
-
-int len;
+char *
+IceGenerateMagicCookie (int len)
{
char *auth;
long ldata[2];
@@ -92,21 +89,17 @@ int len;
}
-
IcePoAuthStatus
-_IcePoMagicCookie1Proc (iceConn, authStatePtr, cleanUp, swap,
- authDataLen, authData, replyDataLenRet, replyDataRet, errorStringRet)
-
-IceConn iceConn;
-IcePointer *authStatePtr;
-Bool cleanUp;
-Bool swap;
-int authDataLen;
-IcePointer authData;
-int *replyDataLenRet;
-IcePointer *replyDataRet;
-char **errorStringRet;
-
+_IcePoMagicCookie1Proc (
+ IceConn iceConn,
+ IcePointer *authStatePtr,
+ Bool cleanUp,
+ Bool swap,
+ int authDataLen,
+ IcePointer authData,
+ int *replyDataLenRet,
+ IcePointer *replyDataRet,
+ char **errorStringRet)
{
if (cleanUp)
{
@@ -171,18 +164,15 @@ char **errorStringRet;
IcePaAuthStatus
-_IcePaMagicCookie1Proc (iceConn, authStatePtr, swap,
- authDataLen, authData, replyDataLenRet, replyDataRet, errorStringRet)
-
-IceConn iceConn;
-IcePointer *authStatePtr;
-Bool swap;
-int authDataLen;
-IcePointer authData;
-int *replyDataLenRet;
-IcePointer *replyDataRet;
-char **errorStringRet;
-
+_IcePaMagicCookie1Proc (
+ IceConn iceConn,
+ IcePointer *authStatePtr,
+ Bool swap,
+ int authDataLen,
+ IcePointer authData,
+ int *replyDataLenRet,
+ IcePointer *replyDataRet,
+ char **errorStringRet)
{
*errorStringRet = NULL;
*replyDataLenRet = 0;
@@ -253,7 +243,6 @@ char **errorStringRet;
}
-
/*
* local routines
*/
diff --git a/src/listen.c b/src/listen.c
index d3aa4b2..e072c2e 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -35,15 +35,12 @@ Author: Ralph Mor, X Consortium
#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
-
Status
-IceListenForConnections (countRet, listenObjsRet, errorLength, errorStringRet)
-
-int *countRet;
-IceListenObj **listenObjsRet;
-int errorLength;
-char *errorStringRet;
-
+IceListenForConnections (
+ int *countRet,
+ IceListenObj **listenObjsRet,
+ int errorLength,
+ char *errorStringRet)
{
struct _IceListenObj *listenObjs;
char *networkId;
@@ -159,35 +156,22 @@ char *errorStringRet;
}
-
int
-IceGetListenConnectionNumber (listenObj)
-
-IceListenObj listenObj;
-
+IceGetListenConnectionNumber (IceListenObj listenObj)
{
return (_IceTransGetConnectionNumber (listenObj->trans_conn));
}
-
char *
-IceGetListenConnectionString (listenObj)
-
-IceListenObj listenObj;
-
+IceGetListenConnectionString (IceListenObj listenObj)
{
return strdup(listenObj->network_id);
}
-
char *
-IceComposeNetworkIdList (count, listenObjs)
-
-int count;
-IceListenObj *listenObjs;
-
+IceComposeNetworkIdList (int count, IceListenObj *listenObjs)
{
char *list;
int len = 0;
@@ -239,13 +223,8 @@ IceListenObj *listenObjs;
}
-
void
-IceFreeListenObjs (count, listenObjs)
-
-int count;
-IceListenObj *listenObjs;
-
+IceFreeListenObjs (int count, IceListenObj *listenObjs)
{
int i;
@@ -260,7 +239,6 @@ IceListenObj *listenObjs;
}
-
/*
* Allow host based authentication for the ICE Connection Setup.
* Do not confuse with the host based authentication callbacks that
@@ -268,11 +246,9 @@ IceListenObj *listenObjs;
*/
void
-IceSetHostBasedAuthProc (listenObj, hostBasedAuthProc)
-
-IceListenObj listenObj;
-IceHostBasedAuthProc hostBasedAuthProc;
-
+IceSetHostBasedAuthProc (
+ IceListenObj listenObj,
+ IceHostBasedAuthProc hostBasedAuthProc)
{
listenObj->host_based_auth_proc = hostBasedAuthProc;
}
diff --git a/src/listenwk.c b/src/listenwk.c
index 26bb6e0..af9d4e7 100644
--- a/src/listenwk.c
+++ b/src/listenwk.c
@@ -38,16 +38,13 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
-
Status
-IceListenForWellKnownConnections (port, countRet, listenObjsRet, errorLength, errorStringRet)
-
-char *port;
-int *countRet;
-IceListenObj **listenObjsRet;
-int errorLength;
-char *errorStringRet;
-
+IceListenForWellKnownConnections (
+ char *port,
+ int *countRet,
+ IceListenObj **listenObjsRet,
+ int errorLength,
+ char *errorStringRet)
{
struct _IceListenObj *listenObjs;
char *networkId;
diff --git a/src/locking.c b/src/locking.c
index 5108030..1757d40 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -40,28 +40,21 @@ Author: Ralph Mor, X Consortium
Status
-IceInitThreads ()
-
+IceInitThreads (void)
{
return (0);
}
void
-IceAppLockConn (iceConn)
-
-IceConn iceConn;
-
+IceAppLockConn (IceConn iceConn)
{
IceLockConn (iceConn);
}
void
-IceAppUnlockConn (iceConn)
-
-IceConn iceConn;
-
+IceAppUnlockConn (IceConn iceConn)
{
IceUnlockConn (iceConn);
}
diff --git a/src/misc.c b/src/misc.c
index 304ae60..2b17895 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -43,17 +43,12 @@ Author: Ralph Mor, X Consortium
#include <X11/Xw32defs.h>
#endif
-
/*
* scratch buffer
*/
char *
-IceAllocScratch (iceConn, size)
-
-IceConn iceConn;
-unsigned long size;
-
+IceAllocScratch (IceConn iceConn, unsigned long size)
{
if (!iceConn->scratch || size > iceConn->scratch_size)
{
@@ -68,16 +63,12 @@ unsigned long size;
}
-
/*
* Output/Input buffer functions
*/
int
-IceFlush (iceConn)
-
-IceConn iceConn;
-
+IceFlush (IceConn iceConn)
{
_IceWrite (iceConn,
(unsigned long) (iceConn->outbufptr - iceConn->outbuf),
@@ -89,95 +80,67 @@ IceConn iceConn;
int
-IceGetOutBufSize (iceConn)
-
-IceConn iceConn;
-
+IceGetOutBufSize (IceConn iceConn)
{
return (iceConn->outbufmax - iceConn->outbuf);
}
int
-IceGetInBufSize (iceConn)
-
-IceConn iceConn;
-
+IceGetInBufSize (IceConn iceConn)
{
return (iceConn->inbufmax - iceConn->inbuf);
}
-
/*
* informational functions
*/
IceConnectStatus
-IceConnectionStatus (iceConn)
-
-IceConn iceConn;
-
+IceConnectionStatus (IceConn iceConn)
{
return (iceConn->connection_status);
}
char *
-IceVendor (iceConn)
-
-IceConn iceConn;
-
+IceVendor (IceConn iceConn)
{
return strdup(iceConn->vendor);
}
char *
-IceRelease (iceConn)
-
-IceConn iceConn;
-
+IceRelease (IceConn iceConn)
{
return strdup(iceConn->release);
}
int
-IceProtocolVersion (iceConn)
-
-IceConn iceConn;
-
+IceProtocolVersion (IceConn iceConn)
{
return (_IceVersions[iceConn->my_ice_version_index].major_version);
}
int
-IceProtocolRevision (iceConn)
-
-IceConn iceConn;
-
+IceProtocolRevision (IceConn iceConn)
{
return (_IceVersions[iceConn->my_ice_version_index].minor_version);
}
int
-IceConnectionNumber (iceConn)
-
-IceConn iceConn;
-
+IceConnectionNumber (IceConn iceConn)
{
return (_IceTransGetConnectionNumber (iceConn->trans_conn));
}
char *
-IceConnectionString (iceConn)
-
-IceConn iceConn;
-
+IceConnectionString (IceConn iceConn)
{
if (iceConn->connection_string)
{
@@ -189,36 +152,26 @@ IceConn iceConn;
unsigned long
-IceLastSentSequenceNumber (iceConn)
-
-IceConn iceConn;
-
+IceLastSentSequenceNumber (IceConn iceConn)
{
return (iceConn->send_sequence);
}
unsigned long
-IceLastReceivedSequenceNumber (iceConn)
-
-IceConn iceConn;
-
+IceLastReceivedSequenceNumber (IceConn iceConn)
{
return (iceConn->receive_sequence);
}
Bool
-IceSwapping (iceConn)
-
-IceConn iceConn;
-
+IceSwapping (IceConn iceConn)
{
return (iceConn->swap);
}
-
/*
* Read "n" bytes from a connection.
*
@@ -227,12 +180,7 @@ IceConn iceConn;
*/
Status
-_IceRead (iceConn, nbytes, ptr)
-
-register IceConn iceConn;
-unsigned long nbytes;
-register char *ptr;
-
+_IceRead (register IceConn iceConn, unsigned long nbytes, register char *ptr)
{
register unsigned long nleft;
@@ -319,7 +267,6 @@ register char *ptr;
}
-
/*
* If we read a message header with a bad major or minor opcode,
* we need to advance to the end of the message. This way, the next
@@ -327,11 +274,7 @@ register char *ptr;
*/
void
-_IceReadSkip (iceConn, nbytes)
-
-register IceConn iceConn;
-register unsigned long nbytes;
-
+_IceReadSkip (register IceConn iceConn, register unsigned long nbytes)
{
char temp[512];
@@ -345,18 +288,12 @@ register unsigned long nbytes;
}
-
/*
* Write "n" bytes to a connection.
*/
void
-_IceWrite (iceConn, nbytes, ptr)
-
-register IceConn iceConn;
-unsigned long nbytes;
-register char *ptr;
-
+_IceWrite (register IceConn iceConn, unsigned long nbytes, register char *ptr)
{
register unsigned long nleft;
@@ -427,12 +364,8 @@ register char *ptr;
#ifdef WORD64
-IceWriteData16 (iceConn, nbytes, data)
-
-IceConn iceConn;
-unsigned long nbytes;
-short *data;
-
+void
+IceWriteData16 (IceConn iceConn, unsigned long nbytes, short *data)
{
int numShorts = nbytes / 2;
int index = 0;
@@ -458,12 +391,8 @@ short *data;
}
-IceWriteData32 (iceConn, nbytes, data)
-
-IceConn iceConn;
-unsigned long nbytes;
-int *data;
-
+void
+IceWriteData32 (IceConn iceConn, unsignedLong nbytes, int *data)
{
int numLongs = nbytes / 4;
int index = 0;
@@ -489,25 +418,14 @@ int *data;
}
-IceReadData16 (iceConn, swap, nbytes, data)
-
-IceConn iceConn;
-Bool swap;
-unsigned long nbytes;
-short *data;
-
+void
+IceReadData16 (IceConn iceConn, Bool swap, unsigned long nbytes, short *data)
{
/* NOT IMPLEMENTED YET */
}
-
-IceReadData32 (iceConn, swap, nbytes, data)
-
-IceConn iceConn;
-Bool swap;
-unsigned long nbytes;
-int *data;
-
+void
+IceReadData32(IceConn iceConn, Bool swap, unsigned long nbytes, int *data)
{
/* NOT IMPLEMENTED YET */
}
@@ -515,14 +433,8 @@ int *data;
#endif /* WORD64 */
-
void
-_IceAddOpcodeMapping (iceConn, hisOpcode, myOpcode)
-
-IceConn iceConn;
-int hisOpcode;
-int myOpcode;
-
+_IceAddOpcodeMapping (IceConn iceConn, int hisOpcode, int myOpcode)
{
if (hisOpcode <= 0 || hisOpcode > 255)
{
@@ -599,14 +511,13 @@ int myOpcode;
}
-
char *
IceGetPeerName (IceConn iceConn)
{
return (_IceTransGetPeerNetworkId (iceConn->trans_conn));
}
-
+
char *
_IceGetPeerName (IceConn iceConn)
{
diff --git a/src/ping.c b/src/ping.c
index 45329b6..e3ec615 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -34,12 +34,10 @@ Author: Ralph Mor, X Consortium
#include "ICElibint.h"
Status
-IcePing (iceConn, pingReplyProc, clientData)
-
-IceConn iceConn;
-IcePingReplyProc pingReplyProc;
-IcePointer clientData;
-
+IcePing (
+ IceConn iceConn,
+ IcePingReplyProc pingReplyProc,
+ IcePointer clientData)
{
_IcePingWait *newping = (_IcePingWait *) malloc (sizeof (_IcePingWait));
_IcePingWait *ptr = iceConn->ping_waits;
diff --git a/src/process.c b/src/process.c
index 416f1c6..2e34f38 100644
--- a/src/process.c
+++ b/src/process.c
@@ -124,12 +124,10 @@ Author: Ralph Mor, X Consortium
*/
IceProcessMessagesStatus
-IceProcessMessages (iceConn, replyWait, replyReadyRet)
-
-IceConn iceConn;
-IceReplyWaitInfo *replyWait;
-Bool *replyReadyRet;
-
+IceProcessMessages (
+ IceConn iceConn,
+ IceReplyWaitInfo *replyWait,
+ Bool *replyReadyRet)
{
iceMsg *header;
Bool replyReady = False;
@@ -388,15 +386,12 @@ Bool *replyReadyRet;
}
-
static void
-AuthRequired (iceConn, authIndex, authDataLen, authData)
-
-IceConn iceConn;
-int authIndex;
-int authDataLen;
-IcePointer authData;
-
+AuthRequired (
+ IceConn iceConn,
+ int authIndex,
+ int authDataLen,
+ IcePointer authData)
{
iceAuthRequiredMsg *pMsg;
@@ -416,14 +411,11 @@ IcePointer authData;
}
-
static void
-AuthReply (iceConn, authDataLen, authData)
-
-IceConn iceConn;
-int authDataLen;
-IcePointer authData;
-
+AuthReply (
+ IceConn iceConn,
+ int authDataLen,
+ IcePointer authData)
{
iceAuthReplyMsg *pMsg;
@@ -442,14 +434,11 @@ IcePointer authData;
}
-
static void
-AuthNextPhase (iceConn, authDataLen, authData)
-
-IceConn iceConn;
-int authDataLen;
-IcePointer authData;
-
+AuthNextPhase (
+ IceConn iceConn,
+ int authDataLen,
+ IcePointer authData)
{
iceAuthNextPhaseMsg *pMsg;
@@ -468,13 +457,8 @@ IcePointer authData;
}
-
static void
-AcceptConnection (iceConn, versionIndex)
-
-IceConn iceConn;
-int versionIndex;
-
+AcceptConnection (IceConn iceConn, int versionIndex)
{
iceConnectionReplyMsg *pMsg;
char *pData;
@@ -497,17 +481,14 @@ int versionIndex;
}
-
static void
-AcceptProtocol (iceConn, hisOpcode, myOpcode, versionIndex, vendor, release)
-
-IceConn iceConn;
-int hisOpcode;
-int myOpcode;
-int versionIndex;
-char *vendor;
-char *release;
-
+AcceptProtocol (
+ IceConn iceConn,
+ int hisOpcode,
+ int myOpcode,
+ int versionIndex,
+ char *vendor,
+ char *release)
{
iceProtocolReplyMsg *pMsg;
char *pData;
@@ -538,27 +519,20 @@ char *release;
}
-
static void
-PingReply (iceConn)
-
-IceConn iceConn;
-
+PingReply (IceConn iceConn)
{
IceSimpleMessage (iceConn, 0, ICE_PingReply);
IceFlush (iceConn);
}
-
static Bool
-ProcessError (iceConn, length, swap, replyWait)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-
+ProcessError (
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap,
+ IceReplyWaitInfo *replyWait)
{
int invokeHandler = 0;
Bool errorReturned = False;
@@ -819,15 +793,11 @@ IceReplyWaitInfo *replyWait;
return (errorReturned);
}
-
-
static int
-ProcessConnectionSetup (iceConn, length, swap)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-
+ProcessConnectionSetup(
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap)
{
iceConnectionSetupMsg *message;
int myVersionCount, hisVersionCount;
@@ -1075,15 +1045,12 @@ Bool swap;
}
-
static Bool
-ProcessAuthRequired (iceConn, length, swap, replyWait)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-
+ProcessAuthRequired (
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap,
+ IceReplyWaitInfo *replyWait)
{
iceAuthRequiredMsg *message;
int authDataLen;
@@ -1270,14 +1237,11 @@ IceReplyWaitInfo *replyWait;
}
-
static int
-ProcessAuthReply (iceConn, length, swap)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-
+ProcessAuthReply (
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap)
{
iceAuthReplyMsg *message;
int replyDataLen;
@@ -1566,15 +1530,12 @@ Bool swap;
}
-
static Bool
-ProcessAuthNextPhase (iceConn, length, swap, replyWait)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-
+ProcessAuthNextPhase(
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap,
+ IceReplyWaitInfo *replyWait)
{
iceAuthNextPhaseMsg *message;
int authDataLen;
@@ -1699,15 +1660,12 @@ IceReplyWaitInfo *replyWait;
}
-
static Bool
-ProcessConnectionReply (iceConn, length, swap, replyWait)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-
+ProcessConnectionReply(
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap,
+ IceReplyWaitInfo *replyWait)
{
iceConnectionReplyMsg *message;
char *pData, *pStart, *pEnd;
@@ -1802,14 +1760,11 @@ IceReplyWaitInfo *replyWait;
}
-
static int
-ProcessProtocolSetup (iceConn, length, swap)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-
+ProcessProtocolSetup (
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap)
{
iceProtocolSetupMsg *message;
_IcePaProtocol *myProtocol;
@@ -2200,15 +2155,12 @@ Bool swap;
}
-
static Bool
-ProcessProtocolReply (iceConn, length, swap, replyWait)
-
-IceConn iceConn;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-
+ProcessProtocolReply (
+ IceConn iceConn,
+ unsigned long length,
+ Bool swap,
+ IceReplyWaitInfo *replyWait)
{
iceProtocolReplyMsg *message;
char *pData, *pStart, *pEnd;
@@ -2315,13 +2267,8 @@ IceReplyWaitInfo *replyWait;
}
-
static int
-ProcessPing (iceConn, length)
-
-IceConn iceConn;
-unsigned long length;
-
+ProcessPing (IceConn iceConn, unsigned long length)
{
CHECK_SIZE_MATCH (iceConn, ICE_Ping,
length, SIZEOF (icePingMsg), IceFatalToConnection, 0);
@@ -2332,13 +2279,8 @@ unsigned long length;
}
-
static int
-ProcessPingReply (iceConn, length)
-
-IceConn iceConn;
-unsigned long length;
-
+ProcessPingReply (IceConn iceConn, unsigned long length)
{
CHECK_SIZE_MATCH (iceConn, ICE_PingReply,
length, SIZEOF (icePingReplyMsg), IceFatalToConnection, 0);
@@ -2362,14 +2304,11 @@ unsigned long length;
}
-
static int
-ProcessWantToClose (iceConn, length, connectionClosedRet)
-
-IceConn iceConn;
-unsigned long length;
-Bool *connectionClosedRet;
-
+ProcessWantToClose (
+ IceConn iceConn,
+ unsigned long length,
+ Bool *connectionClosedRet)
{
*connectionClosedRet = False;
@@ -2422,13 +2361,8 @@ Bool *connectionClosedRet;
}
-
static int
-ProcessNoClose (iceConn, length)
-
-IceConn iceConn;
-unsigned long length;
-
+ProcessNoClose (IceConn iceConn, unsigned long length)
{
CHECK_SIZE_MATCH (iceConn, ICE_NoClose,
length, SIZEOF (iceNoCloseMsg), IceFatalToConnection, 0);
@@ -2451,19 +2385,15 @@ unsigned long length;
}
-
void
-_IceProcessCoreMessage (iceConn, opcode, length, swap,
- replyWait, replyReadyRet, connectionClosedRet)
-
-IceConn iceConn;
-int opcode;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-Bool *replyReadyRet;
-Bool *connectionClosedRet;
-
+_IceProcessCoreMessage (
+ IceConn iceConn,
+ int opcode,
+ unsigned long length,
+ Bool swap,
+ IceReplyWaitInfo *replyWait,
+ Bool *replyReadyRet,
+ Bool *connectionClosedRet)
{
Bool replyReady = False;
diff --git a/src/protosetup.c b/src/protosetup.c
index 7a21e2e..e1150e9 100644
--- a/src/protosetup.c
+++ b/src/protosetup.c
@@ -36,21 +36,17 @@ Author: Ralph Mor, X Consortium
IceProtocolSetupStatus
-IceProtocolSetup (iceConn, myOpcode, clientData, mustAuthenticate,
- majorVersionRet, minorVersionRet, vendorRet, releaseRet,
- errorLength, errorStringRet)
-
-IceConn iceConn;
-int myOpcode;
-IcePointer clientData;
-Bool mustAuthenticate;
-int *majorVersionRet;
-int *minorVersionRet;
-char **vendorRet;
-char **releaseRet;
-int errorLength;
-char *errorStringRet;
-
+IceProtocolSetup (
+ IceConn iceConn,
+ int myOpcode,
+ IcePointer clientData,
+ Bool mustAuthenticate,
+ int *majorVersionRet,
+ int *minorVersionRet,
+ char **vendorRet,
+ char **releaseRet,
+ int errorLength,
+ char *errorStringRet)
{
iceProtocolSetupMsg *pMsg;
char *pData;
diff --git a/src/register.c b/src/register.c
index 501725f..91f1377 100644
--- a/src/register.c
+++ b/src/register.c
@@ -34,19 +34,16 @@ Author: Ralph Mor, X Consortium
#include "ICElibint.h"
int
-IceRegisterForProtocolSetup (protocolName, vendor, release,
- versionCount, versionRecs, authCount, authNames, authProcs, IOErrorProc)
-
-char *protocolName;
-char *vendor;
-char *release;
-int versionCount;
-IcePoVersionRec *versionRecs;
-int authCount;
-const char **authNames;
-IcePoAuthProc *authProcs;
-IceIOErrorProc IOErrorProc;
-
+IceRegisterForProtocolSetup (
+ char *protocolName,
+ char *vendor,
+ char *release,
+ int versionCount,
+ IcePoVersionRec *versionRecs,
+ int authCount,
+ const char **authNames,
+ IcePoAuthProc *authProcs,
+ IceIOErrorProc IOErrorProc)
{
_IcePoProtocol *p;
int opcodeRet, i;
@@ -131,26 +128,20 @@ IceIOErrorProc IOErrorProc;
}
-
int
-IceRegisterForProtocolReply (protocolName, vendor, release,
- versionCount, versionRecs, authCount, authNames, authProcs,
- hostBasedAuthProc, protocolSetupProc, protocolActivateProc,
- IOErrorProc)
-
-char *protocolName;
-char *vendor;
-char *release;
-int versionCount;
-IcePaVersionRec *versionRecs;
-int authCount;
-const char **authNames;
-IcePaAuthProc *authProcs;
-IceHostBasedAuthProc hostBasedAuthProc;
-IceProtocolSetupProc protocolSetupProc;
-IceProtocolActivateProc protocolActivateProc;
-IceIOErrorProc IOErrorProc;
-
+IceRegisterForProtocolReply (
+ char *protocolName,
+ char *vendor,
+ char *release,
+ int versionCount,
+ IcePaVersionRec *versionRecs,
+ int authCount,
+ const char **authNames,
+ IcePaAuthProc *authProcs,
+ IceHostBasedAuthProc hostBasedAuthProc,
+ IceProtocolSetupProc protocolSetupProc,
+ IceProtocolActivateProc protocolActivateProc,
+ IceIOErrorProc IOErrorProc)
{
_IcePaProtocol *p;
int opcodeRet, i;
@@ -239,4 +230,3 @@ IceIOErrorProc IOErrorProc;
return (opcodeRet);
}
-
diff --git a/src/replywait.c b/src/replywait.c
index e00eb92..cc75c19 100644
--- a/src/replywait.c
+++ b/src/replywait.c
@@ -35,11 +35,7 @@ Author: Ralph Mor, X Consortium
void
-_IceAddReplyWait (iceConn, replyWait)
-
-IceConn iceConn;
-IceReplyWaitInfo *replyWait;
-
+_IceAddReplyWait (IceConn iceConn, IceReplyWaitInfo *replyWait)
{
/*
* Add this replyWait to the end of the list (only if the
@@ -75,13 +71,8 @@ IceReplyWaitInfo *replyWait;
}
-
IceReplyWaitInfo *
-_IceSearchReplyWaits (iceConn, majorOpcode)
-
-IceConn iceConn;
-int majorOpcode;
-
+_IceSearchReplyWaits(IceConn iceConn, int majorOpcode)
{
/*
* Return the first replyWait in the list with the given majorOpcode
@@ -99,13 +90,8 @@ int majorOpcode;
}
-
void
-_IceSetReplyReady (iceConn, replyWait)
-
-IceConn iceConn;
-IceReplyWaitInfo *replyWait;
-
+_IceSetReplyReady (IceConn iceConn, IceReplyWaitInfo *replyWait)
{
/*
* The replyWait specified has a reply ready.
@@ -121,13 +107,8 @@ IceReplyWaitInfo *replyWait;
}
-
Bool
-_IceCheckReplyReady (iceConn, replyWait)
-
-IceConn iceConn;
-IceReplyWaitInfo *replyWait;
-
+_IceCheckReplyReady (IceConn iceConn, IceReplyWaitInfo *replyWait)
{
_IceSavedReplyWait *savedReplyWait = iceConn->saved_reply_waits;
_IceSavedReplyWait *prev = NULL;
diff --git a/src/setauth.c b/src/setauth.c
index 8ed9cef..e2aae8a 100644
--- a/src/setauth.c
+++ b/src/setauth.c
@@ -60,11 +60,7 @@ IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES] = {0};
void
-IceSetPaAuthData (numEntries, entries)
-
-int numEntries;
-IceAuthDataEntry *entries;
-
+IceSetPaAuthData (int numEntries, IceAuthDataEntry *entries)
{
/*
* _IcePaAuthDataEntries should really be a linked list.
diff --git a/src/shutdown.c b/src/shutdown.c
index 5c957c7..60b5833 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -37,11 +37,7 @@ Author: Ralph Mor, X Consortium
Status
-IceProtocolShutdown (iceConn, majorOpcode)
-
-IceConn iceConn;
-int majorOpcode;
-
+IceProtocolShutdown (IceConn iceConn, int majorOpcode)
{
if (iceConn->proto_ref_count == 0 || iceConn->process_msg_info == NULL ||
majorOpcode < 1 || majorOpcode > _IceLastMajorOpcode)
@@ -85,35 +81,22 @@ int majorOpcode;
}
-
void
-IceSetShutdownNegotiation (iceConn, negotiate)
-
-IceConn iceConn;
-Bool negotiate;
-
+IceSetShutdownNegotiation (IceConn iceConn, Bool negotiate)
{
iceConn->skip_want_to_close = negotiate ? False : True;
}
-
Bool
-IceCheckShutdownNegotiation (iceConn)
-
-IceConn iceConn;
-
+IceCheckShutdownNegotiation (IceConn iceConn)
{
return (iceConn->skip_want_to_close ? False : True);
}
-
IceCloseStatus
-IceCloseConnection (iceConn)
-
-IceConn iceConn;
-
+IceCloseConnection (IceConn iceConn)
{
int refCountReachedZero;
IceCloseStatus status;
@@ -251,12 +234,8 @@ IceConn iceConn;
}
-
void
-_IceFreeConnection (iceConn)
-
-IceConn iceConn;
-
+_IceFreeConnection (IceConn iceConn)
{
if (iceConn->listen_obj == NULL)
{
@@ -324,7 +303,3 @@ IceConn iceConn;
free ((char *) iceConn);
}
-
-
-
-
diff --git a/src/watch.c b/src/watch.c
index ec90d78..77d9df8 100644
--- a/src/watch.c
+++ b/src/watch.c
@@ -35,11 +35,7 @@ Author: Ralph Mor, X Consortium
Status
-IceAddConnectionWatch (watchProc, clientData)
-
-IceWatchProc watchProc;
-IcePointer clientData;
-
+IceAddConnectionWatch (IceWatchProc watchProc, IcePointer clientData)
{
/*
* watchProc will be called each time an ICE connection is
@@ -92,13 +88,8 @@ IcePointer clientData;
}
-
void
-IceRemoveConnectionWatch (watchProc, clientData)
-
-IceWatchProc watchProc;
-IcePointer clientData;
-
+IceRemoveConnectionWatch (IceWatchProc watchProc, IcePointer clientData)
{
_IceWatchProc *currWatchProc = _IceWatchProcs;
_IceWatchProc *prevWatchProc = NULL;
@@ -132,13 +123,8 @@ IcePointer clientData;
}
}
-
-
void
-_IceConnectionOpened (iceConn)
-
-IceConn iceConn;
-
+_IceConnectionOpened (IceConn iceConn)
{
_IceWatchProc *watchProc = _IceWatchProcs;
@@ -167,13 +153,8 @@ IceConn iceConn;
}
}
-
-
void
-_IceConnectionClosed (iceConn)
-
-IceConn iceConn;
-
+_IceConnectionClosed (IceConn iceConn)
{
_IceWatchProc *watchProc = _IceWatchProcs;
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ xorg mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/xorg
