diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/net/getsockopt.c | 5 | ||||
| -rw-r--r-- | nuttx/net/net_clone.c | 4 | ||||
| -rw-r--r-- | nuttx/net/setsockopt.c | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/nuttx/net/getsockopt.c b/nuttx/net/getsockopt.c index c3afb29c9..405823fb4 100644 --- a/nuttx/net/getsockopt.c +++ b/nuttx/net/getsockopt.c @@ -155,7 +155,7 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option, { err = EINVAL; goto errout; - } + } /* Return the socket type */ @@ -180,7 +180,7 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option, { err = EINVAL; goto errout; - } + } /* Get the timeout value. This is a atomic operation and should * require no special operation. @@ -217,6 +217,7 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option, err = ENOPROTOOPT; goto errout; } + return OK; errout: diff --git a/nuttx/net/net_clone.c b/nuttx/net/net_clone.c index ada223484..b58c7e1c6 100644 --- a/nuttx/net/net_clone.c +++ b/nuttx/net/net_clone.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_clone.c * - * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -75,11 +75,11 @@ int net_clone(FAR struct socket *psock1, FAR struct socket *psock2) psock2->s_flags = psock1->s_flags; /* See _SF_* definitions */ #ifdef CONFIG_NET_SOCKOPTS psock2->s_options = psock1->s_options; /* Selected socket options */ -#endif #ifndef CONFIG_DISABLE_CLOCK psock2->s_rcvtimeo = psock1->s_rcvtimeo; /* Receive timeout value (in deciseconds) */ psock2->s_sndtimeo = psock1->s_sndtimeo; /* Send timeout value (in deciseconds) */ #endif +#endif psock2->s_conn = psock1->s_conn; /* UDP or TCP connection structure */ /* Increment the reference count on the connection */ diff --git a/nuttx/net/setsockopt.c b/nuttx/net/setsockopt.c index ad52ff53d..7b65a7bf7 100644 --- a/nuttx/net/setsockopt.c +++ b/nuttx/net/setsockopt.c @@ -137,7 +137,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option, { err = EINVAL; goto errout; - } + } /* Get the value. Is the option being set or cleared? */ @@ -177,7 +177,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option, { err = EINVAL; goto errout; - } + } /* Get the timeout value */ @@ -226,6 +226,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option, err = ENOPROTOOPT; goto errout; } + return OK; errout: |