From c0bf0b4d9d3bc2cbbfdeaa1955647d6654905aa8 Mon Sep 17 00:00:00 2001
From: Juha Niskanen <juha.niskanen@haltian.com>
Date: Wed, 25 Oct 2017 07:31:14 -0600
Subject: [PATCH] net/usrsock: fix compiler warnings, mostly about nxsem_post

---
 net/socket/getsockopt.c           | 1 -
 net/socket/setsockopt.c           | 1 -
 net/usrsock/usrsock_bind.c        | 4 +---
 net/usrsock/usrsock_close.c       | 2 +-
 net/usrsock/usrsock_conn.c        | 4 ++--
 net/usrsock/usrsock_connect.c     | 4 +---
 net/usrsock/usrsock_dev.c         | 2 +-
 net/usrsock/usrsock_event.c       | 2 +-
 net/usrsock/usrsock_getsockname.c | 4 +---
 net/usrsock/usrsock_getsockopt.c  | 4 +---
 net/usrsock/usrsock_poll.c        | 3 +--
 net/usrsock/usrsock_recvfrom.c    | 4 +---
 net/usrsock/usrsock_sendto.c      | 4 +---
 net/usrsock/usrsock_setsockopt.c  | 4 +---
 net/usrsock/usrsock_socket.c      | 2 +-
 15 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/net/socket/getsockopt.c b/net/socket/getsockopt.c
index eebaefe019a..d6d381402b5 100644
--- a/net/socket/getsockopt.c
+++ b/net/socket/getsockopt.c
@@ -110,7 +110,6 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
   if (psock->s_type == SOCK_USRSOCK_TYPE)
     {
       FAR struct usrsock_conn_s *conn = psock->s_conn;
-      int ret;
 
       DEBUGASSERT(conn);
 
diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c
index 522658e4603..912c7414bd0 100644
--- a/net/socket/setsockopt.c
+++ b/net/socket/setsockopt.c
@@ -120,7 +120,6 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
   if (psock->s_type == SOCK_USRSOCK_TYPE)
     {
       FAR struct usrsock_conn_s *conn = psock->s_conn;
-      int ret;
 
       DEBUGASSERT(conn);
 
diff --git a/net/usrsock/usrsock_bind.c b/net/usrsock/usrsock_bind.c
index 61e32d838d2..39c17fb0331 100644
--- a/net/usrsock/usrsock_bind.c
+++ b/net/usrsock/usrsock_bind.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,11 +49,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_close.c b/net/usrsock/usrsock_close.c
index 2a9397c3f64..96cbc73bd1d 100644
--- a/net/usrsock/usrsock_close.c
+++ b/net/usrsock/usrsock_close.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,6 +49,7 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
 
diff --git a/net/usrsock/usrsock_conn.c b/net/usrsock/usrsock_conn.c
index 5c1386ed692..0e038bf9fbf 100644
--- a/net/usrsock/usrsock_conn.c
+++ b/net/usrsock/usrsock_conn.c
@@ -42,13 +42,13 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
 
 #include <arch/irq.h>
 
+#include <nuttx/semaphore.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
 
@@ -60,7 +60,7 @@
 
 /* The array containing all usrsock connections. */
 
-struct usrsock_conn_s g_usrsock_connections[CONFIG_NET_USRSOCK_CONNS];
+static struct usrsock_conn_s g_usrsock_connections[CONFIG_NET_USRSOCK_CONNS];
 
 /* A list of all free usrsock connections */
 
diff --git a/net/usrsock/usrsock_connect.c b/net/usrsock/usrsock_connect.c
index 35fbe7c53d7..76906ec5e90 100644
--- a/net/usrsock/usrsock_connect.c
+++ b/net/usrsock/usrsock_connect.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,11 +49,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_dev.c b/net/usrsock/usrsock_dev.c
index 06672974146..171434ca8fb 100644
--- a/net/usrsock/usrsock_dev.c
+++ b/net/usrsock/usrsock_dev.c
@@ -44,7 +44,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <semaphore.h>
 #include <string.h>
 #include <poll.h>
 #include <errno.h>
@@ -55,6 +54,7 @@
 
 #include <nuttx/random.h>
 #include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
 
diff --git a/net/usrsock/usrsock_event.c b/net/usrsock/usrsock_event.c
index ec1df67f9d4..e34d012ca23 100644
--- a/net/usrsock/usrsock_event.c
+++ b/net/usrsock/usrsock_event.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,6 +49,7 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
 
diff --git a/net/usrsock/usrsock_getsockname.c b/net/usrsock/usrsock_getsockname.c
index 0de4fe8509a..d3bb4940a87 100644
--- a/net/usrsock/usrsock_getsockname.c
+++ b/net/usrsock/usrsock_getsockname.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,11 +49,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_getsockopt.c b/net/usrsock/usrsock_getsockopt.c
index 24ce3b04af1..4b56713c389 100644
--- a/net/usrsock/usrsock_getsockopt.c
+++ b/net/usrsock/usrsock_getsockopt.c
@@ -43,7 +43,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -51,11 +50,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_poll.c b/net/usrsock/usrsock_poll.c
index 59f69dbdf73..55dc85a14c7 100644
--- a/net/usrsock/usrsock_poll.c
+++ b/net/usrsock/usrsock_poll.c
@@ -43,7 +43,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
@@ -52,11 +51,11 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
 #include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_recvfrom.c b/net/usrsock/usrsock_recvfrom.c
index e17b27c4e28..d30b2a0379b 100644
--- a/net/usrsock/usrsock_recvfrom.c
+++ b/net/usrsock/usrsock_recvfrom.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,11 +49,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_sendto.c b/net/usrsock/usrsock_sendto.c
index 96c2ad39749..5926c60c74e 100644
--- a/net/usrsock/usrsock_sendto.c
+++ b/net/usrsock/usrsock_sendto.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,11 +49,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_setsockopt.c b/net/usrsock/usrsock_setsockopt.c
index b970876c3c1..a84b13f4037 100644
--- a/net/usrsock/usrsock_setsockopt.c
+++ b/net/usrsock/usrsock_setsockopt.c
@@ -43,7 +43,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -51,11 +50,10 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>
-#include <nuttx/kmalloc.h>
 
-#include "socket/socket.h"
 #include "usrsock/usrsock.h"
 
 /****************************************************************************
diff --git a/net/usrsock/usrsock_socket.c b/net/usrsock/usrsock_socket.c
index c2b4775195e..18287d451ef 100644
--- a/net/usrsock/usrsock_socket.c
+++ b/net/usrsock/usrsock_socket.c
@@ -42,7 +42,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -50,6 +49,7 @@
 #include <arch/irq.h>
 
 #include <sys/socket.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/usrsock.h>