nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 09:49:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Remove the unused nx_[send|recv]msg

Browse source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-10-27 23:59:19 +08:00 committed by Petro Karashchenko
parent a8d3286258
commit 1047b65ab5
2 changed files with 16 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
net/socket/recvmsg.c
View file

@ -103,45 +103,6 @@ ssize_t psock_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
return psock->s_sockif->si_recvmsg(psock, msg, flags);
}
/****************************************************************************
* Name: nx_recvmsg
*
* Description:
* nx_recvmsg() receives messages from a socket, and may be used to
* receive data on a socket whether or not it is connection-oriented.
* This is an internal OS interface. It is functionally equivalent to
* recvmsg() except that:
*
* - It is not a cancellation point, and
* - It does not modify the errno variable.
*
* Input Parameters:
* sockfd - Socket descriptor of socket
* msg Buffer to receive the message
* flags - Receive flags
*
* Returned Value:
* On success, returns the number of characters received. If no data is
* available to be received and the peer has performed an orderly shutdown,
* nx_recvmsg() will return 0. Otherwise, on any failure, a negated errno
* value is returned (see comments with recvmsg() for a list of appropriate
* errno values).
*
****************************************************************************/
ssize_t nx_recvmsg(int sockfd, FAR struct msghdr *msg, int flags)
{
FAR struct socket *psock;
/* Get the underlying socket structure */
psock = sockfd_socket(sockfd);
/* Then let psock_recvmsg() do all of the work */
return psock_recvmsg(psock, msg, flags);
}
/****************************************************************************
* Function: recvmsg
*
@ -187,18 +148,23 @@ ssize_t nx_recvmsg(int sockfd, FAR struct msghdr *msg, int flags)
ssize_t recvmsg(int sockfd, FAR struct msghdr *msg, int flags)
{
FAR struct socket *psock;
ssize_t ret;
/* recvmsg() is a cancellation point */
enter_cancellation_point();
/* Let nx_recvmsg() do all of the work */
/* Get the underlying socket structure */
ret = nx_recvmsg(sockfd, msg, flags);
psock = sockfd_socket(sockfd);
/* Then let psock_recvmsg() do all of the work */
ret = psock_recvmsg(psock, msg, flags);
if (ret < 0)
{
_SO_SETERRNO(sockfd_socket(sockfd), -ret);
_SO_SETERRNO(psock, -ret);
ret = ERROR;
}

50
net/socket/sendmsg.c
View file

@ -93,45 +93,6 @@ ssize_t psock_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
return psock->s_sockif->si_sendmsg(psock, msg, flags);
}
/****************************************************************************
* Name: nx_sendmsg
*
* Description:
* nx_sendmsg() receives messages from a socket, and may be used to
* receive data on a socket whether or not it is connection-oriented.
* This is an internal OS interface. It is functionally equivalent to
* sendmsg() except that:
*
* - It is not a cancellation point, and
* - It does not modify the errno variable.
*
* Input Parameters:
* sockfd Socket descriptor of socket
* msg Buffer to receive the message
* flags Receive flags
*
* Returned Value:
* On success, returns the number of characters sent. If no data is
* available to be received and the peer has performed an orderly shutdown,
* sendmsg() will return 0. Otherwise, on any failure, a negated errno
* value is returned (see comments with sendmsg() for a list of appropriate
* errno values).
*
****************************************************************************/
ssize_t nx_sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
{
FAR struct socket *psock;
/* Get the underlying socket structure */
psock = sockfd_socket(sockfd);
/* Then let psock_sendmsg() do all of the work */
return psock_sendmsg(psock, msg, flags);
}
/****************************************************************************
* Function: sendmsg
*
@ -177,18 +138,23 @@ ssize_t nx_sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
ssize_t sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
{
FAR struct socket *psock;
ssize_t ret;
/* sendmsg() is a cancellation point */
enter_cancellation_point();
/* Let psock_sendmsg() do all of the work */
/* Get the underlying socket structure */
ret = nx_sendmsg(sockfd, msg, flags);
psock = sockfd_socket(sockfd);
/* Then let psock_sendmsg() do all of the work */
ret = psock_sendmsg(psock, msg, flags);
if (ret < 0)
{
_SO_SETERRNO(sockfd_socket(sockfd), -ret);
_SO_SETERRNO(psock, -ret);
ret = ERROR;
}