From 70e352ba5ebc8c1e7e3b334efb919da70d3ee7fc Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Thu, 8 Jun 2006 23:11:43 +0200 Subject: [PATCH] removed ixp_socket_accept layeritis --- cmd/wm/fs.c | 2 +- libixp/ixp.h | 1 - libixp/socket.c | 10 ---------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/cmd/wm/fs.c b/cmd/wm/fs.c index e8bacbb9..4193707e 100644 --- a/cmd/wm/fs.c +++ b/cmd/wm/fs.c @@ -1589,7 +1589,7 @@ write_event(char *event) void new_ixp_conn(IXPConn *c) { - int fd = ixp_accept_sock(c->fd); + int fd = accept(c->fd, nil, nil); if(fd >= 0) ixp_server_open_conn(c->srv, fd, do_fcall, ixp_server_close_conn); diff --git a/libixp/ixp.h b/libixp/ixp.h index e2fde0b2..5486dfe8 100644 --- a/libixp/ixp.h +++ b/libixp/ixp.h @@ -243,7 +243,6 @@ void ixp_server_close(IXPServer *s); /* socket.c */ int ixp_connect_sock(char *address); -int ixp_accept_sock(int fd); int ixp_create_sock(char *address, char **errstr); /* transport.c */ diff --git a/libixp/socket.c b/libixp/socket.c index bc98fe8e..6f19101d 100644 --- a/libixp/socket.c +++ b/libixp/socket.c @@ -89,16 +89,6 @@ ixp_connect_sock(char *address) return -1; } -int -ixp_accept_sock(int fd) -{ - socklen_t su_len; - struct sockaddr_un addr = { 0 }; - - su_len = sizeof(struct sockaddr); - return accept(fd, (struct sockaddr *) &addr, &su_len); -} - static int create_inet_sock(char *host, char **errstr) {