ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcrt4: Use closesocket to close sockets and define it to close on Unix platforms to make the code more portable.

This commit is contained in:
Rob Shearman 2008-03-06 14:59:02 +00:00 committed by Alexandre Julliard
parent 0aedac346a
commit a1e4bcda1a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/rpcrt4/rpc_transport.c
View File

@ -64,6 +64,7 @@
# ifdef HAVE_SYS_POLL_H # ifdef HAVE_SYS_POLL_H
# include <sys/poll.h> # include <sys/poll.h>
# endif # endif
# define closesocket close
#endif /* defined(__MINGW32__) || defined (_MSC_VER) */ #endif /* defined(__MINGW32__) || defined (_MSC_VER) */
#include "windef.h" #include "windef.h"
@ -801,7 +802,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection)
if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen))
{ {
WARN("connect() failed: %s\n", strerror(errno)); WARN("connect() failed: %s\n", strerror(errno));
close(sock); closesocket(sock);
continue; continue;
} }
@ -880,7 +881,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr
if (ret < 0) if (ret < 0)
{ {
WARN("bind failed: %s\n", strerror(errno)); WARN("bind failed: %s\n", strerror(errno));
close(sock); closesocket(sock);
if (errno == EADDRINUSE) if (errno == EADDRINUSE)
status = RPC_S_DUPLICATE_ENDPOINT; status = RPC_S_DUPLICATE_ENDPOINT;
else else
@ -892,7 +893,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr
endpoint, NULL, NULL, NULL); endpoint, NULL, NULL, NULL);
if (create_status != RPC_S_OK) if (create_status != RPC_S_OK)
{ {
close(sock); closesocket(sock);
status = create_status; status = create_status;
continue; continue;
} }
@ -1046,7 +1047,7 @@ static int rpcrt4_conn_tcp_close(RpcConnection *Connection)
TRACE("%d\n", tcpc->sock); TRACE("%d\n", tcpc->sock);
if (tcpc->sock != -1) if (tcpc->sock != -1)
close(tcpc->sock); closesocket(tcpc->sock);
tcpc->sock = -1; tcpc->sock = -1;
close(tcpc->cancel_fds[0]); close(tcpc->cancel_fds[0]);
close(tcpc->cancel_fds[1]); close(tcpc->cancel_fds[1]);