summaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-09-11 18:21:57 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-09-11 18:21:57 +0000
commit163c619378cab13dce25ab7c933aee34749353ab (patch)
tree54a0887ddef8d5b19ecc461234ae4e363fac24eb /nuttx/net
parenta1ec4b2084e0de5cc55f5c6847a13804bf5dc451 (diff)
downloadpx4-nuttx-163c619378cab13dce25ab7c933aee34749353ab.tar.gz
px4-nuttx-163c619378cab13dce25ab7c933aee34749353ab.tar.bz2
px4-nuttx-163c619378cab13dce25ab7c933aee34749353ab.zip
Clean up THTTPD watch handling
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2036 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/net_close.c2
-rw-r--r--nuttx/net/netdev_findbyaddr.c2
-rw-r--r--nuttx/net/netdev_txnotify.c2
-rw-r--r--nuttx/net/uip/uip_listen.c4
-rw-r--r--nuttx/net/uip/uip_tcpconn.c2
-rw-r--r--nuttx/net/uip/uip_tcpinput.c2
-rw-r--r--nuttx/net/uip/uip_tcppoll.c4
7 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c
index 7432d2482..eb7dbd711 100644
--- a/nuttx/net/net_close.c
+++ b/nuttx/net/net_close.c
@@ -297,7 +297,7 @@ int net_close(int sockfd)
return OK;
errout:
- *get_errno_ptr() = err;
+ errno = err;
return ERROR;
}
diff --git a/nuttx/net/netdev_findbyaddr.c b/nuttx/net/netdev_findbyaddr.c
index 1b326b3ba..14bd27709 100644
--- a/nuttx/net/netdev_findbyaddr.c
+++ b/nuttx/net/netdev_findbyaddr.c
@@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev_findbyaddr.c
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/net/netdev_txnotify.c b/nuttx/net/netdev_txnotify.c
index 0fd03b0c3..fb6f12893 100644
--- a/nuttx/net/netdev_txnotify.c
+++ b/nuttx/net/netdev_txnotify.c
@@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev_txnotify.c
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/net/uip/uip_listen.c b/nuttx/net/uip/uip_listen.c
index f93501927..f4dfdf6ff 100644
--- a/nuttx/net/uip/uip_listen.c
+++ b/nuttx/net/uip/uip_listen.c
@@ -1,7 +1,7 @@
/****************************************************************************
* net/uip/uip_listen.c
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* A direct leverage of logic from uIP which also has b BSD style license
@@ -256,7 +256,7 @@ int uip_accept(struct uip_driver_s *dev, struct uip_conn *conn, uint16 portno)
* may be waiting on poll()/select() that the connection is available.
*/
- ret = uip_backlogadd(listener, conn);
+ ret = uip_backlogadd(listener, conn);
if (ret == OK)
{
(void)uip_tcpcallback(dev, listener, UIP_BACKLOG);
diff --git a/nuttx/net/uip/uip_tcpconn.c b/nuttx/net/uip/uip_tcpconn.c
index 12451a47f..a6f28d3c6 100644
--- a/nuttx/net/uip/uip_tcpconn.c
+++ b/nuttx/net/uip/uip_tcpconn.c
@@ -347,7 +347,7 @@ void uip_tcpfree(struct uip_conn *conn)
*
* Description:
* Find a connection structure that is the appropriate
- * connection to be used withi the provided TCP/IP header
+ * connection to be used with the provided TCP/IP header
*
* Assumptions:
* This function is called from UIP logic at interrupt level
diff --git a/nuttx/net/uip/uip_tcpinput.c b/nuttx/net/uip/uip_tcpinput.c
index 362229d74..3fc491f6b 100644
--- a/nuttx/net/uip/uip_tcpinput.c
+++ b/nuttx/net/uip/uip_tcpinput.c
@@ -161,7 +161,7 @@ void uip_tcpinput(struct uip_driver_s *dev)
conn = uip_tcpaccept(pbuf);
if (conn)
{
- /* The connection structure was successfully allocated. Now see
+ /* The connection structure was successfully allocated. Now see if
* there is an application waiting to accept the connection (or at
* least queue it it for acceptance).
*/
diff --git a/nuttx/net/uip/uip_tcppoll.c b/nuttx/net/uip/uip_tcppoll.c
index 66a49f953..b851ba167 100644
--- a/nuttx/net/uip/uip_tcppoll.c
+++ b/nuttx/net/uip/uip_tcppoll.c
@@ -2,7 +2,7 @@
* net/uip/uip_tcppoll.c
* Poll for the availability of TCP TX data
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -97,7 +97,7 @@ void uip_tcppoll(struct uip_driver_s *dev, struct uip_conn *conn)
uint8 result;
/* Verify that the connection is established and if the connection has
- * oustanding (unacknowledged) sent data.
+ * no outstanding (unacknowledged) sent data.
*/
if ((conn->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED &&