_ICETrans -> _IceTrans

6 files changed, 29 insertions, 29 deletions

diff --git a/xc/lib/ICE/accept.c b/xc/lib/ICE/accept.c
index af99d8b7c..6dfc4fbfc 100644
--- a/xc/lib/ICE/accept.c
+++ b/xc/lib/ICE/accept.c
@@ -1,4 +1,4 @@
-/* $XConsortium: accept.c,v 1.18 94/01/31 10:45:42 mor Exp $ */
+/* $XConsortium: accept.c,v 1.19 94/03/15 13:37:02 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -38,7 +38,7 @@ IceAcceptStatus	*statusRet;
      * Accept the connection.
      */
 
-    if ((newconn = _ICETransAccept (listenObj->trans_conn, &status)) == 0)
+    if ((newconn = _IceTransAccept (listenObj->trans_conn, &status)) == 0)
     {
 	if (status == TRANS_ACCEPT_BAD_MALLOC)
 	    *statusRet = IceAcceptBadMalloc;
@@ -54,7 +54,7 @@ IceAcceptStatus	*statusRet;
 
     if ((iceConn = (IceConn) malloc (sizeof (struct _IceConn))) == NULL)
     {
-	_ICETransClose (newconn);
+	_IceTransClose (newconn);
 	*statusRet = IceAcceptBadMalloc;
 	return (NULL);
     }
@@ -74,7 +74,7 @@ IceAcceptStatus	*statusRet;
 
     if (iceConn->connection_string == NULL)
     {
-	_ICETransClose (newconn);
+	_IceTransClose (newconn);
 	free ((char *) iceConn);
 	*statusRet = IceAcceptBadMalloc;
 	return (NULL);
@@ -92,7 +92,7 @@ IceAcceptStatus	*statusRet;
     }
     else
     {
-	_ICETransClose (newconn);
+	_IceTransClose (newconn);
 	free ((char *) iceConn);
 	*statusRet = IceAcceptBadMalloc;
 	return (NULL);
@@ -105,7 +105,7 @@ IceAcceptStatus	*statusRet;
     }
     else
     {
-	_ICETransClose (newconn);
+	_IceTransClose (newconn);
 	free (iceConn->inbuf);
 	free ((char *) iceConn);
 	*statusRet = IceAcceptBadMalloc;
diff --git a/xc/lib/ICE/connect.c b/xc/lib/ICE/connect.c
index 345ad1894..9b3951849 100644
--- a/xc/lib/ICE/connect.c
+++ b/xc/lib/ICE/connect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: connect.c,v 1.23 94/02/05 01:46:13 rws Exp $ */
+/* $XConsortium: connect.c,v 1.24 94/03/15 13:37:23 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -412,14 +412,14 @@ char **actualConnectionRet;
 
 	for (retry = ICE_CONNECTION_RETRIES; retry >= 0; retry--)
 	{
-	    if ((trans_conn = _ICETransOpenCOTSClient (address)) == NULL)
+	    if ((trans_conn = _IceTransOpenCOTSClient (address)) == NULL)
 	    {
 		break;
 	    }
 
-	    if ((connect_stat = _ICETransConnect (trans_conn, address)) < 0)
+	    if ((connect_stat = _IceTransConnect (trans_conn, address)) < 0)
 	    {
-		_ICETransClose (trans_conn);
+		_IceTransClose (trans_conn);
 
 		if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
 		{
diff --git a/xc/lib/ICE/listen.c b/xc/lib/ICE/listen.c
index b6487b04e..0b67910a4 100644
--- a/xc/lib/ICE/listen.c
+++ b/xc/lib/ICE/listen.c
@@ -1,4 +1,4 @@
-/* $XConsortium: listen.c,v 1.10 94/02/03 16:20:17 mor Exp $ */
+/* $XConsortium: listen.c,v 1.11 94/03/15 13:32:59 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -41,7 +41,7 @@ char		*errorStringRet;
     XtransConnInfo		*transConns = NULL;
 
 
-    if ((_ICETransMakeAllCOTSServerListeners (NULL, &partial,
+    if ((_IceTransMakeAllCOTSServerListeners (NULL, &partial,
 	&transCount, &transConns) < 0) || (transCount < 1))
     {
 	*listenObjsRet = NULL;
@@ -57,7 +57,7 @@ char		*errorStringRet;
 	transCount * sizeof (struct _IceListenObj))) == NULL)
     {
 	for (i = 0; i < transCount; i++)
-	    _ICETransClose (transConns[i]);
+	    _IceTransClose (transConns[i]);
 	free ((char *) transConns);
 	return (0);
     }
@@ -66,9 +66,9 @@ char		*errorStringRet;
 
     for (i = 0; i < transCount; i++)
     {
-	_ICETransGetMyAddr (transConns[i], &family, &addrlen, &addr);
+	_IceTransGetMyAddr (transConns[i], &family, &addrlen, &addr);
 
-	networkId = _ICETransGetMyNetworkId (family, addrlen, addr);
+	networkId = _IceTransGetMyNetworkId (family, addrlen, addr);
 
 	free (addr);
 
@@ -140,7 +140,7 @@ char		*errorStringRet;
     else
     {
 	for (i = 0; i < transCount; i++)
-	    _ICETransClose (transConns[i]);
+	    _IceTransClose (transConns[i]);
     }
 
     free ((char *) listenObjs);
@@ -157,7 +157,7 @@ IceGetListenConnectionNumber (listenObj)
 IceListenObj listenObj;
 
 {
-    return (_ICETransGetConnectionNumber (listenObj->trans_conn));
+    return (_IceTransGetConnectionNumber (listenObj->trans_conn));
 }
 
 
@@ -231,7 +231,7 @@ IceListenObj *listenObjs;
     for (i = 0; i < count; i++)
     {
 	free (listenObjs[i]->network_id);
-	_ICETransClose (listenObjs[i]->trans_conn);
+	_IceTransClose (listenObjs[i]->trans_conn);
 	free ((char *) listenObjs[i]);
     }
 
diff --git a/xc/lib/ICE/misc.c b/xc/lib/ICE/misc.c
index c33e2155c..4670be157 100644
--- a/xc/lib/ICE/misc.c
+++ b/xc/lib/ICE/misc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: misc.c,v 1.19 94/03/17 15:37:31 mor Exp $ */
+/* $XConsortium: misc.c,v 1.20 94/03/18 10:19:43 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -169,7 +169,7 @@ IceConnectionNumber (iceConn)
 IceConn iceConn;
 
 {
-    return (_ICETransGetConnectionNumber (iceConn->trans_conn));
+    return (_IceTransGetConnectionNumber (iceConn->trans_conn));
 }
 
 
@@ -245,7 +245,7 @@ register char	 *ptr;
     nleft = nbytes;
     while (nleft > 0)
     {
-	int nread = _ICETransRead (iceConn->trans_conn, ptr, (int) nleft);
+	int nread = _IceTransRead (iceConn->trans_conn, ptr, (int) nleft);
 
 	if (nread <= 0)
 	{
@@ -359,7 +359,7 @@ register char	 *ptr;
     nleft = nbytes;
     while (nleft > 0)
     {
-	int nwritten = _ICETransWrite (iceConn->trans_conn, ptr, (int) nleft);
+	int nwritten = _IceTransWrite (iceConn->trans_conn, ptr, (int) nleft);
 
 	if (nwritten <= 0)
 	{
@@ -598,14 +598,14 @@ IceConn iceConn;
     char 	*networkId;
 
 
-    if (_ICETransGetPeerAddr (iceConn->trans_conn,
+    if (_IceTransGetPeerAddr (iceConn->trans_conn,
 	&family, &peer_addrlen, &peer_addr) < 0)
     {
 	return (NULL);
     }
     else
     {
-	networkId = _ICETransGetPeerNetworkId (
+	networkId = _IceTransGetPeerNetworkId (
 	    family, peer_addrlen, peer_addr);
 
 	free (peer_addr);
diff --git a/xc/lib/ICE/shutdown.c b/xc/lib/ICE/shutdown.c
index 13fecf0d7..140ff878d 100644
--- a/xc/lib/ICE/shutdown.c
+++ b/xc/lib/ICE/shutdown.c
@@ -1,4 +1,4 @@
-/* $XConsortium: shutdown.c,v 1.10 94/01/31 11:01:48 mor Exp $ */
+/* $XConsortium: shutdown.c,v 1.11 94/03/15 13:34:04 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -203,7 +203,7 @@ Bool	ignoreWatchProcs;
     }
 
     if (iceConn->trans_conn)
-	_ICETransClose (iceConn->trans_conn);
+	_IceTransClose (iceConn->trans_conn);
 
     if (iceConn->connection_string)
 	free (iceConn->connection_string);
diff --git a/xc/lib/SM/sm_manager.c b/xc/lib/SM/sm_manager.c
index 02eb644db..ed9733742 100644
--- a/xc/lib/SM/sm_manager.c
+++ b/xc/lib/SM/sm_manager.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sm_manager.c,v 1.17 94/02/21 09:15:13 mor Exp $ */
+/* $XConsortium: sm_manager.c,v 1.18 94/03/07 17:08:44 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -125,14 +125,14 @@ SmsConn smsConn;
     char	*hostname;
 
 
-    if (_ICETransGetPeerAddr (smsConn->iceConn->trans_conn,
+    if (_IceTransGetPeerAddr (smsConn->iceConn->trans_conn,
 	&family, &peer_addrlen, &peer_addr) < 0)
     {
 	return (NULL);
     }
     else
     {
-	hostname = _ICETransGetPeerNetworkId (family, peer_addrlen, peer_addr);
+	hostname = _IceTransGetPeerNetworkId (family, peer_addrlen, peer_addr);
 
 	free ((char *) peer_addr);