frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused DECnet code 

"unifdef -UDNETCONN src/xcb_util.c" plus re-indenting code that was
formerly in the else clause after a DECnet check.

DECnet support has been removed from most of the X.Org code base for
several years, and it appears DNETCONN was never defined in XCB.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Alan Coopersmith 2011-04-04 20:12:56 -07:00
parent 7131d5d070
commit 4b502dd696
1 changed files with 6 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/xcb_util.c
View File

@ -28,10 +28,6 @@
#include <assert.h>
#include <sys/types.h>
#include <limits.h>
#ifdef DNETCONN
#include <netdnet/dnetdb.h>
#include <netdnet/dn.h>
#endif
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@ -161,9 +157,6 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short
#ifndef _WIN32
static int _xcb_open_unix(char *protocol, const char *file);
#endif /* !WIN32 */
#ifdef DNETCONN
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
#endif
#ifdef HAVE_ABSTRACT_SOCKETS
static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
#endif
@ -187,26 +180,13 @@ static int _xcb_open(const char *host, char *protocol, const int display)
if(*host || protocol)
{
#ifdef DNETCONN
/* DECnet displays have two colons, so _xcb_parse_display will have
left one at the end. However, an IPv6 address can end with *two*
colons, so only treat this as a DECnet display if host ends with
exactly one colon. */
char *colon = strchr(host, ':');
if(colon && *(colon+1) == '\0')
{
*colon = '\0';
return _xcb_open_decnet(host, protocol, display);
}
else
#endif
if (protocol
|| strcmp("unix",host)) { /* follow the old unix: rule */
if (protocol
|| strcmp("unix",host)) { /* follow the old unix: rule */
/* display specifies TCP */
unsigned short port = X_TCP_PORT + display;
return _xcb_open_tcp(host, protocol, port);
}
/* display specifies TCP */
unsigned short port = X_TCP_PORT + display;
return _xcb_open_tcp(host, protocol, port);
}
}
#ifndef _WIN32
@ -279,45 +259,6 @@ static int _xcb_socket(int family, int type, int proto)
return fd;
}
#ifdef DNETCONN
static int _xcb_open_decnet(const char *host, const char *protocol, const unsigned short port)
{
int fd;
struct sockaddr_dn addr;
struct accessdata_dn accessdata;
struct nodeent *nodeaddr = getnodebyname(host);
if(!nodeaddr)
return -1;
if (protocol && strcmp("dnet",protocol))
return -1;
addr.sdn_family = AF_DECnet;
addr.sdn_add.a_len = nodeaddr->n_length;
memcpy(addr.sdn_add.a_addr, nodeaddr->n_addr, addr.sdn_add.a_len);
addr.sdn_objnamel = sprintf((char *)addr.sdn_objname, "X$X%d", port);
if(addr.sdn_objnamel < 0)
return -1;
addr.sdn_objnum = 0;
fd = _xcb_socket(PF_DECnet, SOCK_STREAM, 0);
if(fd == -1)
return -1;
memset(&accessdata, 0, sizeof(accessdata));
accessdata.acc_accl = sprintf((char*)accessdata.acc_acc, "%d", getuid());
if(accessdata.acc_accl < 0)
return -1;
setsockopt(fd, DNPROTO_NSP, SO_CONACCESS, &accessdata, sizeof(accessdata));
if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
close(fd);
return -1;
}
return fd;
}
#endif
static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port)
{