SwallowOS/xorg_lib_libxtrans
1
0
Fork 0
mirror of https://github.com/SwallowOS/xorg_lib_libxtrans synced 2025-11-06 07:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused TLI ("STREAMSCONN") code from xtrans

Browse Source 
Has never been converted to build in modular builds, so has been unusable
since X11R7.0 release in 2005.  All known platforms with TLI/XTI support
that X11R7 & later releases run on also have (and mostly prefer) BSD
socket support for their networking API.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith
2012-12-26 19:08:16 -08:00
parent 8ce5ecd33b
commit ec3136232f
5 changed files with 10 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -7,7 +7,6 @@ Xtransinclude_HEADERS = \
Xtransint.h \ Xtransint.h \
Xtranslcl.c \ Xtranslcl.c \
Xtranssock.c \ Xtranssock.c \
Xtranstli.c \
Xtransutil.c \ Xtransutil.c \
transport.c transport.c

5
Xtrans.c
View File

@@ -80,11 +80,6 @@ from The Open Group.
static static
Xtransport_table Xtransports[] = { Xtransport_table Xtransports[] = {
#if defined(STREAMSCONN)
{ &TRANS(TLITCPFuncs), TRANS_TLI_TCP_INDEX },
{ &TRANS(TLIINETFuncs), TRANS_TLI_INET_INDEX },
{ &TRANS(TLITLIFuncs), TRANS_TLI_TLI_INDEX },
#endif /* STREAMSCONN */
#if defined(TCPCONN) #if defined(TCPCONN)
{ &TRANS(SocketTCPFuncs), TRANS_SOCKET_TCP_INDEX }, { &TRANS(SocketTCPFuncs), TRANS_SOCKET_TCP_INDEX },
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)

1407
Xtranstli.c
View File

File diff suppressed because it is too large Load Diff

20
Xtransutil.c
View File

@@ -95,7 +95,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
switch( *familyp ) switch( *familyp )
{ {
#if defined(TCPCONN) || defined(STREAMSCONN) #if defined(TCPCONN)
case AF_INET: case AF_INET:
{ {
/* /*
@@ -158,7 +158,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
break; break;
} }
#endif /* IPv6 */ #endif /* IPv6 */
#endif /* defined(TCPCONN) || defined(STREAMSCONN) */ #endif /* defined(TCPCONN) */
#if defined(UNIXCONN) || defined(LOCALCONN) #if defined(UNIXCONN) || defined(LOCALCONN)
@@ -251,7 +251,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
switch (family) switch (family)
{ {
#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
{ {
struct sockaddr_un *saddr = (struct sockaddr_un *) addr; struct sockaddr_un *saddr = (struct sockaddr_un *) addr;
@@ -261,9 +261,9 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
hostnamebuf, saddr->sun_path); hostnamebuf, saddr->sun_path);
break; break;
} }
#endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */ #endif /* defined(UNIXCONN) || defined(LOCALCONN) */
#if defined(TCPCONN) || defined(STREAMSCONN) #if defined(TCPCONN)
case AF_INET: case AF_INET:
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
case AF_INET6: case AF_INET6:
@@ -290,7 +290,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
sprintf (networkId, "%s/%s:%s", transName, hostnamebuf, portnumbuf); sprintf (networkId, "%s/%s:%s", transName, hostnamebuf, portnumbuf);
break; break;
} }
#endif /* defined(TCPCONN) || defined(STREAMSCONN) */ #endif /* defined(TCPCONN) */
default: default:
@@ -341,16 +341,16 @@ TRANS(GetPeerNetworkId) (XtransConnInfo ciptr)
switch (family) switch (family)
{ {
case AF_UNSPEC: case AF_UNSPEC:
#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
{ {
if (gethostname (addrbuf, sizeof (addrbuf)) == 0) if (gethostname (addrbuf, sizeof (addrbuf)) == 0)
addr = addrbuf; addr = addrbuf;
break; break;
} }
#endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */ #endif /* defined(UNIXCONN) || defined(LOCALCONN) */
#if defined(TCPCONN) || defined(STREAMSCONN) #if defined(TCPCONN)
case AF_INET: case AF_INET:
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
case AF_INET6: case AF_INET6:
@@ -410,7 +410,7 @@ TRANS(GetPeerNetworkId) (XtransConnInfo ciptr)
break; break;
} }
#endif /* defined(TCPCONN) || defined(STREAMSCONN) */ #endif /* defined(TCPCONN) */
default: default:

3
transport.c
View File

@@ -66,9 +66,6 @@ from The Open Group.
#if defined(TCPCONN) || defined(UNIXCONN) #if defined(TCPCONN) || defined(UNIXCONN)
#include "Xtranssock.c" #include "Xtranssock.c"
#endif #endif
#ifdef STREAMSCONN
#include "Xtranstli.c"
#endif
#include "Xtrans.c" #include "Xtrans.c"
#include "Xtransutil.c" #include "Xtransutil.c"