epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Accept should return SOCKET rather than int

Browse Source
This commit is contained in:
Freddie Akeroyd
2024-02-01 00:51:30 +00:00
committed by Andrew Johnson
parent cb49bd0133
commit 5dfc6caf3c
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libcom/src/log/iocLogServer.c
View File

@@ -43,7 +43,7 @@ static char ioc_log_file_command[256];
struct iocLogClient {
int insock;
SOCKET insock;
struct ioc_log_server *pserver;
size_t nChar;
char recvbuf[1024];

4
modules/libcom/src/osi/os/WIN32/osdSock.c
View File

@@ -119,8 +119,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
return socket ( domain, type, protocol );
}
LIBCOM_API int epicsStdCall epicsSocketAccept (
int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
{
return accept ( sock, pAddr, addrlen );
}

4
modules/libcom/src/osi/os/posix/osdSock.c
View File

@@ -124,8 +124,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
return sock;
}
LIBCOM_API int epicsStdCall epicsSocketAccept (
int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
{
#ifndef HAVE_SOCK_CLOEXEC
int newSock = accept ( sock, pAddr, addrlen );

4
modules/libcom/src/osi/os/vxWorks/osdSock.c
View File

@@ -44,8 +44,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
return sock;
}
LIBCOM_API int epicsStdCall epicsSocketAccept (
int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
{
int newSock = accept ( sock, pAddr, addrlen );
if ( newSock < 0 ) {

4
modules/libcom/src/osi/osiSock.h
View File

@@ -63,8 +63,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
* peer address.
* \return A new socket used for communicating with the peer just accepted, or -1 on error.
*/
LIBCOM_API int epicsStdCall epicsSocketAccept (
int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen );
LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen );
/*!
* \brief Close and free resources held by a SOCKET object.
*