Many changes to reduce complaints from CppCheck. Several latent bugs fixes, but probably some new typos introduced

4 files changed, 38 insertions, 45 deletions

diff --git a/nuttx/drivers/wireless/cc3000/cc3000.c b/nuttx/drivers/wireless/cc3000/cc3000.c
index 8e3b03c23..b051578cc 100644
--- a/nuttx/drivers/wireless/cc3000/cc3000.c
+++ b/nuttx/drivers/wireless/cc3000/cc3000.c
@@ -1292,7 +1292,7 @@ static int cc3000_poll(FAR struct file *filep, FAR struct pollfd *fds,
 {
   FAR struct inode *inode;
   FAR struct cc3000_dev_s *priv;
-  int ret = OK;
+  int ret;
   int i;
 
   nllvdbg("setup: %d\n", (int)setup);
diff --git a/nuttx/drivers/wireless/cc3000/socket.c b/nuttx/drivers/wireless/cc3000/socket.c
index 006c34cfd..aa67d8606 100644
--- a/nuttx/drivers/wireless/cc3000/socket.c
+++ b/nuttx/drivers/wireless/cc3000/socket.c
@@ -186,6 +186,7 @@ int cc3000_socket(int domain, int type, int protocol)
 int cc3000_closesocket(int sockfd)
 {
   int ret;
+
   cc3000_lib_lock();
   ret = cc3000_closesocket_impl(sockfd);
 #ifdef CONFIG_CC3000_MT
@@ -243,6 +244,7 @@ int cc3000_closesocket(int sockfd)
 int cc3000_do_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 {
   int ret;
+
   cc3000_lib_lock();
   ret = cc3000_accept_impl(sockfd, addr, addrlen);
   cc3000_lib_unlock();
@@ -265,8 +267,6 @@ int cc3000_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 }
 #else
 {
-  int ret = OK;
-
   cc3000_accept_socket(sockfd,0);
   short nonBlocking=CC3000_SOCK_OFF;
 
@@ -306,7 +306,7 @@ int cc3000_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 
 int cc3000_bind(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_bind_impl(sockfd, addr, addrlen);
@@ -340,7 +340,7 @@ int cc3000_bind(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen)
 
 int cc3000_listen(int sockfd, int backlog)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_listen_impl(sockfd,backlog);
@@ -380,7 +380,7 @@ int cc3000_listen(int sockfd, int backlog)
 
 int cc3000_connect(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_connect_impl(sockfd, addr, addrlen);
@@ -430,7 +430,7 @@ int cc3000_connect(int sockfd, FAR const struct sockaddr *addr, socklen_t addrle
 int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds,
            struct timeval *timeout)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_select_impl(nfds, (TICC3000fd_set *)readfds,
@@ -492,7 +492,7 @@ int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds,
 int cc3000_setsockopt(int sockfd, int level, int option,
                       FAR const void *value, socklen_t value_len)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_setsockopt_impl(sockfd, level, option, value, value_len);
@@ -552,7 +552,7 @@ int cc3000_setsockopt(int sockfd, int level, int option,
 int cc3000_getsockopt(int sockfd, int level, int option, FAR void *value,
                       FAR socklen_t *value_len)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_getsockopt_impl(sockfd, level, option, value, value_len);
@@ -584,7 +584,7 @@ int cc3000_getsockopt(int sockfd, int level, int option, FAR void *value,
 
 ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
 {
-  ssize_t ret = OK;
+  ssize_t ret;
 
 #ifdef CONFIG_CC3000_MT
   ret = cc3000_wait_data(sockfd);
@@ -632,7 +632,7 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
 ssize_t cc3000_recvfrom(int sockfd, FAR void *buf, size_t len, int flags,
                         FAR struct sockaddr *from, FAR socklen_t *fromlen)
 {
-  ssize_t ret = OK;
+  ssize_t ret;
 
 #ifdef CONFIG_CC3000_MT
   ret = cc3000_wait_data(sockfd);
@@ -672,7 +672,7 @@ ssize_t cc3000_recvfrom(int sockfd, FAR void *buf, size_t len, int flags,
 
 ssize_t cc3000_send(int sockfd, FAR const void *buf, size_t len, int flags)
 {
-  ssize_t ret = OK;
+  ssize_t ret;
 
   cc3000_lib_lock();
   ret = cc3000_send_impl(sockfd, buf, len, flags);
@@ -709,7 +709,7 @@ ssize_t cc3000_send(int sockfd, FAR const void *buf, size_t len, int flags)
 ssize_t cc3000_sendto(int sockfd, FAR const void *buf, size_t len, int flags,
                       FAR const struct sockaddr *to, socklen_t tolen)
 {
-  ssize_t ret = OK;
+  ssize_t ret;
 
   cc3000_lib_lock();
   ret = cc3000_sendto_impl(sockfd, buf, len, flags, to, tolen);
@@ -744,7 +744,7 @@ ssize_t cc3000_sendto(int sockfd, FAR const void *buf, size_t len, int flags,
 // TODO: Standard is struct hostent *gethostbyname(const char *name);
 int cc3000_gethostbyname(char * hostname, uint16_t usNameLen, unsigned long* out_ip_addr)
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_gethostbyname_impl(hostname, usNameLen, out_ip_addr);
@@ -775,7 +775,7 @@ int cc3000_mdnsadvertiser(uint16_t mdnsEnabled, char *deviceServiceName,
                           uint16_t deviceServiceNameLength)
 
 {
-  int ret = OK;
+  int ret;
 
   cc3000_lib_lock();
   ret = cc3000_mdnsadvertiser_impl(mdnsEnabled, deviceServiceName, deviceServiceNameLength);
diff --git a/nuttx/drivers/wireless/cc3000/socket_imp.c b/nuttx/drivers/wireless/cc3000/socket_imp.c
index 262135b65..8ebc16d3f 100644
--- a/nuttx/drivers/wireless/cc3000/socket_imp.c
+++ b/nuttx/drivers/wireless/cc3000/socket_imp.c
@@ -135,9 +135,9 @@ int HostFlowControlConsumeBuff(int sd)
 
       if (tSLInformation.slTransmitDataError != 0)
         {
-          errno = tSLInformation.slTransmitDataError;
+          set_errno(tSLInformation.slTransmitDataError);
           tSLInformation.slTransmitDataError = 0;
-          return errno;
+          return tSLInformation.slTransmitDataError;
         }
 
       if (SOCKET_STATUS_ACTIVE != get_socket_active_status(sd))
@@ -165,9 +165,9 @@ int HostFlowControlConsumeBuff(int sd)
 
   if (tSLInformation.slTransmitDataError != 0)
     {
-      errno = tSLInformation.slTransmitDataError;
+      set_errno(tSLInformation.slTransmitDataError);
       tSLInformation.slTransmitDataError = 0;
-      return errno;
+      return tSLInformation.slTransmitDataError;
     }
 
   if (SOCKET_STATUS_ACTIVE != get_socket_active_status(sd))
@@ -240,10 +240,8 @@ int cc3000_socket_impl(long domain, long type, long protocol)
 
   /* Process the event */
 
-  errno = ret;
-
+  set_errno(ret);
   set_socket_active_status(ret, SOCKET_STATUS_ACTIVE);
-
   return ret;
 }
 
@@ -282,7 +280,7 @@ long cc3000_closesocket_impl(long sd)
   /* Since we are in blocking state - wait for event complete */
 
   SimpleLinkWaitEvent(HCI_CMND_CLOSE_SOCKET, &ret);
-  errno = ret;
+  set_errno(ret);
 
   /* Since 'close' call may result in either OK (and then it closed) or error
    * mark this socket as invalid
@@ -344,7 +342,6 @@ long cc3000_accept_impl(long sd, struct sockaddr *addr, socklen_t *addrlen)
   uint8_t *ptr, *args;
   tBsdReturnParams tAcceptReturnArguments;
 
-  ret = EFAIL;
   ptr = tSLInformation.pucTxCommandBuffer;
   args = (ptr + HEADERS_SIZE_CMD);
 
@@ -366,8 +363,8 @@ long cc3000_accept_impl(long sd, struct sockaddr *addr, socklen_t *addrlen)
 
   memcpy(addr, &tAcceptReturnArguments.tSocketAddress, CC3000_ASIC_ADDR_LEN);
   *addrlen = CC3000_ASIC_ADDR_LEN;
-  errno = tAcceptReturnArguments.iStatus;
-  ret = errno;
+  set_errno(tAcceptReturnArguments.iStatus);
+  ret = tAcceptReturnArguments.iStatus;
 
   /* if succeeded, iStatus = new socket descriptor. otherwise - error number */
 
@@ -433,8 +430,7 @@ long cc3000_bind_impl(long sd, const struct sockaddr *addr, socklen_t addrlen)
 
   SimpleLinkWaitEvent(HCI_CMND_BIND, &ret);
 
-  errno = ret;
-
+  set_errno(ret);
   return ret;
 }
 
@@ -484,8 +480,8 @@ long cc3000_listen_impl(long sd, long backlog)
   /* Since we are in blocking state - wait for event complete */
 
   SimpleLinkWaitEvent(HCI_CMND_LISTEN, &ret);
-  errno = ret;
 
+  set_errno(ret);
   return ret;
 }
 
@@ -518,11 +514,11 @@ int cc3000_gethostbyname_impl(char * hostname, uint16_t usNameLen, unsigned long
   tBsdGethostbynameParams ret;
   uint8_t *ptr, *args;
 
-  errno = EFAIL;
+  set_errno(EFAIL);
 
   if (usNameLen > CC3000_HOSTNAME_MAX_LENGTH)
     {
-      return errno;
+      return get_errno();
     }
 
   ptr = tSLInformation.pucTxCommandBuffer;
@@ -543,11 +539,11 @@ int cc3000_gethostbyname_impl(char * hostname, uint16_t usNameLen, unsigned long
 
   SimpleLinkWaitEvent(HCI_EVNT_BSD_GETHOSTBYNAME, &ret);
 
-  errno = ret.retVal;
+  set_errno(ret.retVal);
 
   (*((long*)out_ip_addr)) = ret.outputAddress;
 
-  return errno;
+  return ret.retVal;
 }
 #endif
 
@@ -607,8 +603,7 @@ long cc3000_connect_impl(long sd, const struct sockaddr *addr, socklen_t addrlen
 
   SimpleLinkWaitEvent(HCI_CMND_CONNECT, &ret);
 
-  errno = ret;
-
+  set_errno(ret);
   return (long)ret;
 }
 
@@ -727,7 +722,7 @@ int cc3000_select_impl(long nfds, TICC3000fd_set *readsds, TICC3000fd_set *write
     }
   else
     {
-      errno = tParams.iStatus;
+      set_errno(tParams.iStatus);
       return -1;
     }
 }
@@ -813,7 +808,7 @@ int cc3000_setsockopt_impl(long sd, long level, long optname, const void *optval
     }
   else
     {
-      errno = ret;
+      set_errno(ret);
       return ret;
     }
 }
@@ -898,8 +893,8 @@ int cc3000_getsockopt_impl(long sd, long level, long optname, void *optval, sock
     }
   else
     {
-      errno = tRetParams.iStatus;
-      return errno;
+      set_errno(tRetParams.iStatus);
+      return tRetParams.iStatus;
     }
 }
 
@@ -961,8 +956,7 @@ int simple_link_recv(long sd, void *buf, long len, long flags, struct sockaddr *
       SimpleLinkWaitData((uint8_t *)buf, (uint8_t *)from, (uint8_t *)fromlen);
     }
 
-  errno = tSocketReadEvent.iNumberOfBytes;
-
+  set_errno(tSocketReadEvent.iNumberOfBytes);
   return tSocketReadEvent.iNumberOfBytes;
 }
 
diff --git a/nuttx/drivers/wireless/cc3000/wlan.c b/nuttx/drivers/wireless/cc3000/wlan.c
index f49a09add..5e680a697 100644
--- a/nuttx/drivers/wireless/cc3000/wlan.c
+++ b/nuttx/drivers/wireless/cc3000/wlan.c
@@ -396,7 +396,7 @@ long wlan_connect(unsigned long ulSecType, char *ssid, long ssid_len,
   /* Wait for command complete event */
 
   SimpleLinkWaitEvent(HCI_CMND_WLAN_CONNECT, &ret);
-  errno = ret;
+  set_errno(ret);
   cc3000_lib_unlock();
   return ret;
 }
@@ -436,7 +436,7 @@ long wlan_connect(char *ssid, long ssid_len)
   /* Wait for command complete event */
 
   SimpleLinkWaitEvent(HCI_CMND_WLAN_CONNECT, &ret);
-  errno = ret;
+  set_errno(ret);
 
   cc3000_lib_unlock();
 
@@ -473,7 +473,7 @@ long wlan_disconnect(void)
   /* Wait for command complete event */
 
   SimpleLinkWaitEvent(HCI_CMND_WLAN_DISCONNECT, &ret);
-  errno = ret;
+  set_errno(ret);
 
   cc3000_lib_unlock();
 
@@ -1055,7 +1055,6 @@ long wlan_smart_config_start(unsigned long algoEncryptedFlag)
   /* Fill in HCI packet structure */
 
   args = UINT32_TO_STREAM(args, algoEncryptedFlag);
-  ret  = EFAIL;
 
   hci_command_send(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_START, ptr,
                    WLAN_SMART_CONFIG_START_PARAMS_LEN);