[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libice: Changes to 'upstream-unstable'



 .gitignore               |    4 
 Makefile.am              |    7 -
 configure.ac             |   16 +--
 include/X11/ICE/ICElib.h |    4 
 include/X11/ICE/ICEmsg.h |   23 ++++
 src/ICElibint.h          |    3 
 src/Makefile.am          |    2 
 src/accept.c             |   11 --
 src/authutil.c           |   59 +++++------
 src/connect.c            |   25 ++--
 src/error.c              |  194 +++++++++++++++++--------------------
 src/getauth.c            |   68 +++++--------
 src/globals.h            |   17 ---
 src/iceauth.c            |   74 +++++---------
 src/icetrans.c           |    8 -
 src/listen.c             |   54 ++++------
 src/listenwk.c           |   15 +-
 src/locking.c            |   19 +--
 src/misc.c               |  190 ++++++++++++++++---------------------
 src/ping.c               |   11 --
 src/process.c            |  241 +++++++++++++++++++++--------------------------
 src/protosetup.c         |   27 ++---
 src/register.c           |   56 ++++------
 src/replywait.c          |   36 +++----
 src/setauth.c            |    9 -
 src/shutdown.c           |   39 +++----
 src/watch.c              |   32 ++----
 27 files changed, 566 insertions(+), 678 deletions(-)

New commits:
commit 2f41ddb3a917c4e71184452b68561a15593d33b8
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Tue Jan 6 17:25:25 2009 -0200

    Update .gitignore.
    
      Don't warn about files left after a build and/or make distcheck
    in 'git status -a'.

diff --git a/.gitignore b/.gitignore
index da4d9c4..80aa9f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@ missing
 mkinstalldirs
 stamp-h1
 *~
+tags
+*.o
+libICE-*.tar.*
+ChangeLog

commit ab9dff549534c6d7b33f440bff7a841d60c1206c
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date:   Mon Dec 8 18:45:44 2008 +0100

    bump to 1.0.5

diff --git a/configure.ac b/configure.ac
index de0726e..657a38b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libICE],
-        1.0.4,
+        1.0.5,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libICE)
 

commit 71695c4bf7ae07228605683f6cdeca0457c8495a
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date:   Mon Dec 8 18:44:26 2008 +0100

    remove ChangeLog from EXTRA_DIST and CLEANFILES

diff --git a/Makefile.am b/Makefile.am
index 5d79b62..5d3daa9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ice.pc
 
-EXTRA_DIST=ice.pc.in ChangeLog
-CLEANFILES = ChangeLog
+EXTRA_DIST=ice.pc.in
 
 .PHONY: ChangeLog
 

commit 653f659fe65ae8c2a9fe5b1fdbfc78da43f2cf90
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date:   Mon Dec 8 18:41:34 2008 +0100

    use memcmp instead of binaryEqual
    
    suggested by Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
    http://lists.freedesktop.org/archives/xorg/2008-December/041222.html

diff --git a/src/iceauth.c b/src/iceauth.c
index 6addcf8..40f1fff 100644
--- a/src/iceauth.c
+++ b/src/iceauth.c
@@ -38,8 +38,6 @@ Author: Ralph Mor, X Consortium
 #include <time.h>
 #define Time_t time_t
 
-static int binaryEqual (const char *a, const char *b, unsigned len);
-
 static int was_called_state;
 
 /*
@@ -213,7 +211,7 @@ _IcePaMagicCookie1Proc (
 	    IcePaAuthStatus stat;
 
 	    if (authDataLen == length &&
-	        binaryEqual ((char *) authData, data, authDataLen))
+	        memcmp (authData, data, authDataLen) == 0)
 	    {
 		stat = IcePaAuthAccepted;
 	    }
@@ -249,18 +247,3 @@ _IcePaMagicCookie1Proc (
 }
 
 IcePaAuthProc	_IcePaAuthProcs[] = {_IcePaMagicCookie1Proc};
-
-
-/*
- * local routines
- */
-
-static int
-binaryEqual (const char *a, const char *b, unsigned len)
-
-{
-    while (len--)
-	if (*a++ != *b++)
-	    return 0;
-    return 1;
-}

commit bf138553afe6eecd0e6c218dc6ae4f63065e4196
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date:   Tue Dec 2 22:06:15 2008 +0100

    Use NULL, not zero, for pointers
    
    From Magnus Kessler <Magnus.Kessler@gmx.net>
    http://lists.freedesktop.org/archives/xorg/2008-October/039799.html
    http://lists.freedesktop.org/archives/xorg/attachments/20081030/b2ea5b1c/attachment-0001.bin

diff --git a/src/accept.c b/src/accept.c
index f102b29..150d8bd 100644
--- a/src/accept.c
+++ b/src/accept.c
@@ -50,7 +50,7 @@ IceAcceptConnection (
      * 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 65d256f..2191f06 100644
--- a/src/authutil.c
+++ b/src/authutil.c
@@ -441,7 +441,7 @@ read_counted_string (FILE *file, unsigned short	*countp, char **stringp)
 
     if (len == 0)
     {
-	data = 0;
+	data = NULL;
     }
     else
     {

commit b01e82ce1deedb36c9696d4d27a3b9a5d5a52d08
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date:   Thu Oct 30 12:01:06 2008 +0100

    ANSI C
    
    convert all old style function declarations
    
    see also: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
    http://bugs.freedesktop.org/show_bug.cgi?id=14683
    http://bugs.freedesktop.org/attachment.cgi?id=14582
    
    see also: Magnus Kessler <Magnus.Kessler@gmx.net>
    http://lists.freedesktop.org/archives/xorg/2008-October/039799.html
    http://lists.freedesktop.org/archives/xorg/attachments/20081030/b2ea5b1c/attachment-0001.bin

diff --git a/src/accept.c b/src/accept.c
index d54ffd4..f102b29 100644
--- a/src/accept.c
+++ b/src/accept.c
@@ -36,11 +36,10 @@ Author: Ralph Mor, X Consortium
 
 
 IceConn
-IceAcceptConnection (listenObj, statusRet)
-
-IceListenObj 	listenObj;
-IceAcceptStatus	*statusRet;
-
+IceAcceptConnection (
+	IceListenObj 	listenObj,
+	IceAcceptStatus	*statusRet
+)
 {
     IceConn    		iceConn;
     XtransConnInfo	newconn;
diff --git a/src/authutil.c b/src/authutil.c
old mode 100755
new mode 100644
index 9cb3deb..65d256f
--- 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;
@@ -140,13 +139,12 @@ 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;
@@ -217,10 +215,9 @@ long	dead;
 
 
 void
-IceUnlockAuthFile (file_name)
-
-char	*file_name;
-
+IceUnlockAuthFile (
+	char	*file_name
+)
 {
 #ifndef WIN32
     char	creat_name[1025];
@@ -246,10 +243,9 @@ char	*file_name;
 
 
 IceAuthFileEntry *
-IceReadAuthFileEntry (auth_file)
-
-FILE	*auth_file;
-
+IceReadAuthFileEntry (
+	FILE	*auth_file
+)
 {
     IceAuthFileEntry   	local;
     IceAuthFileEntry   	*ret;
@@ -298,10 +294,9 @@ FILE	*auth_file;
 
 
 void
-IceFreeAuthFileEntry (auth)
-
-IceAuthFileEntry	*auth;
-
+IceFreeAuthFileEntry (
+	IceAuthFileEntry	*auth
+)
 {
     if (auth)
     {
@@ -317,11 +312,10 @@ 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);
@@ -346,12 +340,11 @@ 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;
diff --git a/src/connect.c b/src/connect.c
index 3874058..f948a0a 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -42,16 +42,14 @@ static XtransConnInfo ConnectToPeer(char *networkIdsList,
 #define Strstr strstr
 
 IceConn
-IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck,
-    errorLength, errorStringRet)
-
-char 	   *networkIdsList;
-IcePointer context;
-Bool 	   mustAuthenticate;
-int  	   majorOpcodeCheck;
-int  	   errorLength;
-char 	   *errorStringRet;
-
+IceOpenConnection (
+	char 	   *networkIdsList,
+	IcePointer context,
+	Bool 	   mustAuthenticate,
+	int  	   majorOpcodeCheck,
+	int  	   errorLength,
+	char 	   *errorStringRet
+)
 {
     IceConn			iceConn;
     int				extra, i, j;
@@ -432,10 +430,9 @@ char 	   *errorStringRet;
 
 
 IcePointer
-IceGetConnectionContext (iceConn)
-
-IceConn    iceConn;
-
+IceGetConnectionContext (
+	IceConn    iceConn
+)
 {
     return (iceConn->context);
 }
diff --git a/src/error.c b/src/error.c
index f0ce72a..44b8853 100644
--- a/src/error.c
+++ b/src/error.c
@@ -40,13 +40,12 @@ 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 +59,12 @@ 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 +78,12 @@ 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 +97,14 @@ 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 +125,10 @@ IcePointer	value;
 
 
 void
-_IceErrorNoAuthentication (iceConn, offendingMinor)
-
-IceConn	iceConn;
-int	offendingMinor;
-
+_IceErrorNoAuthentication (
+	IceConn	iceConn,
+	int	offendingMinor
+)
 {
     int severity = (offendingMinor == ICE_ConnectionSetup) ?
 	IceFatalToConnection : IceFatalToProtocol;
@@ -150,11 +145,10 @@ int	offendingMinor;
 
 
 void
-_IceErrorNoVersion (iceConn, offendingMinor)
-
-IceConn	iceConn;
-int	offendingMinor;
-
+_IceErrorNoVersion (
+	IceConn	iceConn,
+	int	offendingMinor
+)
 {
     int severity = (offendingMinor == ICE_ConnectionSetup) ?
 	IceFatalToConnection : IceFatalToProtocol;
@@ -171,12 +165,11 @@ 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 +196,11 @@ 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 +225,11 @@ 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 +254,10 @@ char	*reason;
 
 
 void
-_IceErrorProtocolDuplicate (iceConn, protocolName)
-
-IceConn	iceConn;
-char	*protocolName;
-
+_IceErrorProtocolDuplicate (
+	IceConn	iceConn,
+	char	*protocolName
+)
 {
     char *pBuf, *pStart;
     int bytes;
@@ -292,11 +282,10 @@ char	*protocolName;
 
 
 void
-_IceErrorMajorOpcodeDuplicate (iceConn, majorOpcode)
-
-IceConn	iceConn;
-int	majorOpcode;
-
+_IceErrorMajorOpcodeDuplicate (
+	IceConn	iceConn,
+	int	majorOpcode
+)
 {
     char mOp = (char) majorOpcode;
 
@@ -313,11 +302,10 @@ int	majorOpcode;
 
 
 void
-_IceErrorUnknownProtocol (iceConn, protocolName)
-
-IceConn	iceConn;
-char	*protocolName;
-
+_IceErrorUnknownProtocol (
+	IceConn	iceConn,
+	char	*protocolName
+)
 {
     char *pBuf, *pStart;
     int bytes;
@@ -342,13 +330,12 @@ 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;
 
diff --git a/src/getauth.c b/src/getauth.c
index 4ad7878..6641512 100644
--- a/src/getauth.c
+++ b/src/getauth.c
@@ -60,15 +60,13 @@ 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;
 
@@ -93,15 +91,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;
@@ -134,16 +130,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;
@@ -195,16 +189,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/iceauth.c b/src/iceauth.c
index d782954..6addcf8 100644
--- a/src/iceauth.c
+++ b/src/iceauth.c
@@ -49,10 +49,9 @@ static int was_called_state;
 
 
 char *
-IceGenerateMagicCookie (len)
-
-int len;
-
+IceGenerateMagicCookie (
+	int len
+)
 {
     char    *auth;
     long    ldata[2];
diff --git a/src/listen.c b/src/listen.c
index d3aa4b2..eb46f87 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -37,13 +37,12 @@ Author: Ralph Mor,  X Consortium
 
 
 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;
@@ -161,10 +160,9 @@ char		*errorStringRet;
 
 
 int
-IceGetListenConnectionNumber (listenObj)
-
-IceListenObj listenObj;
-
+IceGetListenConnectionNumber (
+	IceListenObj listenObj
+)
 {
     return (_IceTransGetConnectionNumber (listenObj->trans_conn));
 }
@@ -172,10 +170,9 @@ IceListenObj listenObj;
 
 
 char *
-IceGetListenConnectionString (listenObj)
-
-IceListenObj listenObj;
-
+IceGetListenConnectionString (
+	IceListenObj listenObj
+)
 {
     return strdup(listenObj->network_id);
 }
@@ -183,11 +180,10 @@ IceListenObj listenObj;
 
 
 char *
-IceComposeNetworkIdList (count, listenObjs)
-
-int		count;
-IceListenObj	*listenObjs;
-
+IceComposeNetworkIdList (
+	int		count,
+	IceListenObj	*listenObjs
+)
 {
     char *list;
     int len = 0;
@@ -241,11 +237,10 @@ IceListenObj	*listenObjs;
 
 
 void
-IceFreeListenObjs (count, listenObjs)
-
-int	     count;
-IceListenObj *listenObjs;
-
+IceFreeListenObjs (
+	int	     count,
+	IceListenObj *listenObjs
+)
 {
     int i;
 
@@ -268,11 +263,10 @@ 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..f5061c4 100644
--- a/src/listenwk.c
+++ b/src/listenwk.c
@@ -40,14 +40,13 @@ in this Software without prior written authorization from The Open Group.
 
 
 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..e504e3f 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -40,28 +40,27 @@ 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..ea8bbde 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -49,11 +49,10 @@ Author: Ralph Mor, X Consortium
  */
 
 char *
-IceAllocScratch (iceConn, size)
-
-IceConn		iceConn;
-unsigned long	size;
-
+IceAllocScratch (
+	IceConn		iceConn,
+	unsigned long	size
+)
 {
     if (!iceConn->scratch || size > iceConn->scratch_size)
     {
@@ -74,10 +73,9 @@ unsigned long	size;
  */
 
 int
-IceFlush (iceConn)
-     
-IceConn iceConn;
-
+IceFlush (
+	IceConn iceConn
+)
 {
     _IceWrite (iceConn,
 	(unsigned long) (iceConn->outbufptr - iceConn->outbuf),
@@ -89,20 +87,18 @@ 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);
 }
@@ -114,70 +110,63 @@ IceConn iceConn;
  */
 
 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);
 }
 


Reply to: