Major structure of file system functions to better support asynchronous I/O. Respository should not be trusted until I have a chance to verify everything

5 files changed, 9 insertions, 9 deletions

diff --git a/nuttx/net/socket/Make.defs b/nuttx/net/socket/Make.defs
index 7cc4a4be6..44645261a 100644
--- a/nuttx/net/socket/Make.defs
+++ b/nuttx/net/socket/Make.defs
@@ -36,7 +36,7 @@
 # Include socket source files
 
 SOCK_CSRCS += bind.c connect.c getsockname.c recv.c recvfrom.c socket.c
-SOCK_CSRCS += sendto.c net_sockets.c net_close.c net_dup.c net_dup2.c
+SOCK_CSRCS += sendto.c net_sockets.c net_close.c net_dupsd.c net_dupsd2.c
 SOCK_CSRCS += net_clone.c net_poll.c net_vfcntl.c
 
 # TCP/IP support
diff --git a/nuttx/net/socket/net_clone.c b/nuttx/net/socket/net_clone.c
index 94a143672..4c761857d 100644
--- a/nuttx/net/socket/net_clone.c
+++ b/nuttx/net/socket/net_clone.c
@@ -60,7 +60,7 @@
  * Function: net_clone
  *
  * Description:
- *   Performs the low level, common portion of net_dup() and net_dup2()
+ *   Performs the low level, common portion of net_dupsd() and net_dupsd2()
  *
  ****************************************************************************/
 
diff --git a/nuttx/net/socket/net_dup.c b/nuttx/net/socket/net_dupsd.c
index 0c8a35c0b..3d286923e 100644
--- a/nuttx/net/socket/net_dup.c
+++ b/nuttx/net/socket/net_dupsd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/socket/net_dup.c
+ * net/socket/net_dupsd.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +57,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Function: net_dup
+ * Function: net_dupsd
  *
  * Description:
  *   Clone a socket descriptor to an arbitray descriptor number.  If file
@@ -67,7 +67,7 @@
  *
  ****************************************************************************/
 
-int net_dup(int sockfd, int minsd)
+int net_dupsd(int sockfd, int minsd)
 {
   FAR struct socket *psock1 = sockfd_socket(sockfd);
   FAR struct socket *psock2;
diff --git a/nuttx/net/socket/net_dup2.c b/nuttx/net/socket/net_dupsd2.c
index 063123722..2919b4374 100644
--- a/nuttx/net/socket/net_dup2.c
+++ b/nuttx/net/socket/net_dupsd2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/socket/net_dup2.c
+ * net/socket/net_dupsd2.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Function: net_dup2
+ * Function: net_dupsd2
  *
  * Description:
  *   Clone a socket descriptor to an arbitray descriptor number.  If file
@@ -64,7 +64,7 @@
  ****************************************************************************/
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
-int net_dup2(int sockfd1, int sockfd2)
+int net_dupsd2(int sockfd1, int sockfd2)
 #else
 int dup2(int sockfd1, int sockfd2)
 #endif
diff --git a/nuttx/net/socket/net_vfcntl.c b/nuttx/net/socket/net_vfcntl.c
index 2c79197ee..7ec6f48d7 100644
--- a/nuttx/net/socket/net_vfcntl.c
+++ b/nuttx/net/socket/net_vfcntl.c
@@ -108,7 +108,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
          */
 
         {
-          ret = net_dup(sockfd, va_arg(ap, int));
+          ret = net_dupsd(sockfd, va_arg(ap, int));
         }
         break;