From c5b818fdce12a3b14c307cff275dfa3e0d842292 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 19 Jun 2012 02:53:00 +0000 Subject: [PATCH] Remove Recv wrapper. --- ncat/ncat_listen.c | 2 +- ncat/sys_wrap.c | 11 ----------- ncat/sys_wrap.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c index 005210619..0bf2dcdff 100644 --- a/ncat/ncat_listen.c +++ b/ncat/ncat_listen.c @@ -673,7 +673,7 @@ static int ncat_listen_dgram(int proto) } /* Dump the current datagram */ - nbytes = Recv(socket_n, buf, sizeof(buf), 0); + nbytes = recv(socket_n, buf, sizeof(buf), 0); if (nbytes < 0) { loguser("%s.\n", socket_strerror(socket_errno())); close(socket_n); diff --git a/ncat/sys_wrap.c b/ncat/sys_wrap.c index a8994f404..c9285a6f8 100644 --- a/ncat/sys_wrap.c +++ b/ncat/sys_wrap.c @@ -166,17 +166,6 @@ ssize_t Read(int fd, void *buf, size_t count) return ret; } -ssize_t Recv(int s, void *buf, size_t len, int flags) -{ - ssize_t ret; - - ret = recv(s, (char *) buf, len, flags); - if (ret < 0) - die("recv"); - - return ret; -} - ssize_t Recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen) { diff --git a/ncat/sys_wrap.h b/ncat/sys_wrap.h index d3083a7b4..fc8e4cf20 100644 --- a/ncat/sys_wrap.h +++ b/ncat/sys_wrap.h @@ -135,7 +135,6 @@ int Dup2(int oldfd, int newfd); int Listen(int s, int backlog); int Open(const char *pathname, int flags, mode_t mode); ssize_t Read(int fd, void *buf, size_t count); -ssize_t Recv(int s, void *buf, size_t len, int flags); ssize_t Recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); int Setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen); sighandler_t Signal(int signum, sighandler_t handler);