Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reserver the name 'err' for other purposes

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 14:40:07 -06:00
parent 1cdc746726
commit 86b79b33cf
49 changed files with 374 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/socket/connect.c
+11 -11
View File
@@ -507,13 +507,13 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
#if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_UDP) || defined(CONFIG_NET_LOCAL)
int ret;
#endif
int err;
int errcode;
/* Verify that the psock corresponds to valid, allocated socket */
if (!psock || psock->s_crefs <= 0)
{
err = EBADF;
errcode = EBADF;
goto errout;
}
@@ -526,7 +526,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
{
if (addrlen < sizeof(struct sockaddr_in))
{
err = EBADF;
errcode = EBADF;
goto errout;
}
}
@@ -538,7 +538,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
{
if (addrlen < sizeof(struct sockaddr_in6))
{
err = EBADF;
errcode = EBADF;
goto errout;
}
}
@@ -550,7 +550,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
{
if (addrlen < sizeof(sa_family_t))
{
err = EBADF;
errcode = EBADF;
goto errout;
}
}
@@ -559,7 +559,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
default:
DEBUGPANIC();
err = EAFNOSUPPORT;
errcode = EAFNOSUPPORT;
goto errout;
}
@@ -574,7 +574,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
if (_SS_ISCONNECTED(psock->s_flags))
{
err = EISCONN;
errcode = EISCONN;
goto errout;
}
@@ -604,7 +604,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
if (ret < 0)
{
err = -ret;
errcode = -ret;
goto errout;
}
}
@@ -644,7 +644,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
if (ret < 0)
{
err = -ret;
errcode = -ret;
goto errout;
}
}
@@ -652,14 +652,14 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
#endif /* CONFIG_NET_UDP || CONFIG_NET_LOCAL_DGRAM */
default:
err = EBADF;
errcode = EBADF;
goto errout;
}
return OK;
errout:
set_errno(err);
set_errno(errcode);
return ERROR;
}