Filename changes needed by ZDS archiver

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1452 42af7a65-404d-4744-a932-0658087f49c3

34 files changed, 80 insertions, 82 deletions

diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile
index 97c758dd7..7880a974e 100644
--- a/nuttx/net/Makefile
+++ b/nuttx/net/Makefile
@@ -38,7 +38,7 @@
 ifeq ($(CONFIG_NET),y)
 SOCK_ASRCS	=
 SOCK_CSRCS	= socket.c bind.c connect.c sendto.c recv.c recvfrom.c \
-		  net-sockets.c net-close.c
+		  net_sockets.c net_close.c
 
 ifeq ($(CONFIG_NET_TCP),y)
 SOCK_CSRCS	+= send.c listen.c accept.c 
@@ -47,14 +47,14 @@ endif
 ifeq ($(CONFIG_NET_SOCKOPTS),y)
 SOCK_CSRCS      += setsockopt.c getsockopt.c 
 ifneq ($(CONFIG_DISABLE_CLOCK),y)
-SOCK_CSRCS	+= net-timeo.c net-dsec2timeval.c net-timeval2dsec.c net-arptimer.c
+SOCK_CSRCS	+= net_timeo.c net_dsec2timeval.c net_timeval2dsec.c net_arptimer.c
 endif
 endif
 
 NETDEV_ASRCS	=
-NETDEV_CSRCS	= netdev-register.c netdev-ioctl.c net-poll.c netdev-txnotify.c \
-		  netdev-findbyname.c netdev-findbyaddr.c netdev-count.c \
-		  netdev-foreach.c
+NETDEV_CSRCS	= netdev_register.c netdev_ioctl.c net_poll.c netdev_txnotify.c \
+		  netdev_findbyname.c netdev_findbyaddr.c netdev_count.c \
+		  netdev_foreach.c
 
 include uip/Make.defs
 endif
diff --git a/nuttx/net/accept.c b/nuttx/net/accept.c
index f4c54e5f3..a3a2e067e 100644
--- a/nuttx/net/accept.c
+++ b/nuttx/net/accept.c
@@ -50,7 +50,7 @@
 
 #include <arch/irq.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/bind.c b/nuttx/net/bind.c
index d75245c8a..381a554bb 100644
--- a/nuttx/net/bind.c
+++ b/nuttx/net/bind.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/bind.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c
index 3bb28638c..917049be9 100644
--- a/nuttx/net/connect.c
+++ b/nuttx/net/connect.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/connect.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <arch/irq.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 #include "uip/uip-internal.h"
 
 /****************************************************************************
diff --git a/nuttx/net/getsockopt.c b/nuttx/net/getsockopt.c
index 5b96762c0..186de82af 100644
--- a/nuttx/net/getsockopt.c
+++ b/nuttx/net/getsockopt.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/getsockopt.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/listen.c b/nuttx/net/listen.c
index 46bad5d94..b4d519d9b 100644
--- a/nuttx/net/listen.c
+++ b/nuttx/net/listen.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/listen.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/net-arptimer.c b/nuttx/net/net_arptimer.c
index bbb4ef6cb..e3c281c38 100644
--- a/nuttx/net/net-arptimer.c
+++ b/nuttx/net/net_arptimer.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/net-arptimer.c
+ * net/net_arptimer.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 
 #include <net/uip/uip-arp.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/net-close.c b/nuttx/net/net_close.c
index 1f704ca00..d94d7cc43 100644
--- a/nuttx/net/net-close.c
+++ b/nuttx/net/net_close.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/net-close.c
+ * net/net_close.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <arch/irq.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 #include "uip/uip-internal.h"
 
 /****************************************************************************
diff --git a/nuttx/net/net-dsec2timeval.c b/nuttx/net/net_dsec2timeval.c
index 0ff1ab2c2..f447b91bf 100644
--- a/nuttx/net/net-dsec2timeval.c
+++ b/nuttx/net/net_dsec2timeval.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/net-dsec2timeval.c
+ * net/net_dsec2timeval.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <nuttx/clock.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/net-internal.h b/nuttx/net/net_internal.h
index 37d22c280..ebef372f9 100644
--- a/nuttx/net/net-internal.h
+++ b/nuttx/net/net_internal.h
@@ -47,8 +47,6 @@
 #include <nuttx/net.h>
 #include <net/uip/uip.h>
 
-#include "net-internal.h"
-
 /****************************************************************************
  * Definitions
  ****************************************************************************/
diff --git a/nuttx/net/net-poll.c b/nuttx/net/net_poll.c
index 6dcb4c2d0..2e5eea122 100644
--- a/nuttx/net/net-poll.c
+++ b/nuttx/net/net_poll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/net-poll.c
+ * net/net_poll.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -54,7 +54,7 @@
 
 #include <uip/uip-internal.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/net/net-sockets.c b/nuttx/net/net_sockets.c
index 8463f63d8..cda0c105e 100644
--- a/nuttx/net/net-sockets.c
+++ b/nuttx/net/net_sockets.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net-sockets.c
+ * net_sockets.c
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -51,7 +51,7 @@
 #include <nuttx/net.h>
 #include <nuttx/kmalloc.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/net-timeo.c b/nuttx/net/net_timeo.c
index 0bc25c030..e4b95d4ce 100644
--- a/nuttx/net/net-timeo.c
+++ b/nuttx/net/net_timeo.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/net-timeo.c
+ * net/net_timeo.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 
 #include <nuttx/clock.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/net-timeval2dsec.c b/nuttx/net/net_timeval2dsec.c
index eb68fc4e5..87f6b0966 100644
--- a/nuttx/net/net-timeval2dsec.c
+++ b/nuttx/net/net_timeval2dsec.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/net-timeval2dsec.c
+ * net/net_timeval2dsec.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <nuttx/clock.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/netdev-count.c b/nuttx/net/netdev_count.c
index c4ca49fd5..5550b28c4 100644
--- a/nuttx/net/netdev-count.c
+++ b/nuttx/net/netdev_count.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-count.c
+ * net/netdev_count.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/netdev-findbyaddr.c b/nuttx/net/netdev_findbyaddr.c
index ff4cd7a6d..1b326b3ba 100644
--- a/nuttx/net/netdev-findbyaddr.c
+++ b/nuttx/net/netdev_findbyaddr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-findbyaddr.c
+ * net/netdev_findbyaddr.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/netdev-findbyname.c b/nuttx/net/netdev_findbyname.c
index 6c3d59ae3..3a9db0c0d 100644
--- a/nuttx/net/netdev-findbyname.c
+++ b/nuttx/net/netdev_findbyname.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-findbyname.c
+ * net/netdev_findbyname.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/netdev-foreach.c b/nuttx/net/netdev_foreach.c
index 54472eb98..760ed20c8 100644
--- a/nuttx/net/netdev-foreach.c
+++ b/nuttx/net/netdev_foreach.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-foreach.c
+ * net/netdev_foreach.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <nuttx/net.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/netdev-ioctl.c b/nuttx/net/netdev_ioctl.c
index f54362ff3..c80f75e4f 100644
--- a/nuttx/net/netdev-ioctl.c
+++ b/nuttx/net/netdev_ioctl.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-ioctl.c
+ * net/netdev_ioctl.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
 #include <net/uip/uip-arch.h>
 #include <net/uip/uip.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/netdev-register.c b/nuttx/net/netdev_register.c
index 5f06b665b..86d8bf83f 100644
--- a/nuttx/net/netdev-register.c
+++ b/nuttx/net/netdev_register.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-register.c
+ * net/netdev_register.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@
 #include <net/ethernet.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/netdev-txnotify.c b/nuttx/net/netdev_txnotify.c
index c600e34d3..0fd03b0c3 100644
--- a/nuttx/net/netdev-txnotify.c
+++ b/nuttx/net/netdev_txnotify.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/netdev-txnotify.c
+ * net/netdev_txnotify.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/recv.c b/nuttx/net/recv.c
index 135b6f319..3d5b82f2c 100644
--- a/nuttx/net/recv.c
+++ b/nuttx/net/recv.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/recv.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/recvfrom.c b/nuttx/net/recvfrom.c
index 0d0a24db8..a74f9c8bd 100644
--- a/nuttx/net/recvfrom.c
+++ b/nuttx/net/recvfrom.c
@@ -51,7 +51,7 @@
 #include <nuttx/clock.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 #include "uip/uip-internal.h"
 
 /****************************************************************************
diff --git a/nuttx/net/send.c b/nuttx/net/send.c
index 74a96f7f8..06e1c7177 100644
--- a/nuttx/net/send.c
+++ b/nuttx/net/send.c
@@ -51,7 +51,7 @@
 #include <nuttx/clock.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 #include "uip/uip-internal.h"
 
 /****************************************************************************
diff --git a/nuttx/net/sendto.c b/nuttx/net/sendto.c
index 57c37668b..acf1ea0c8 100644
--- a/nuttx/net/sendto.c
+++ b/nuttx/net/sendto.c
@@ -48,7 +48,7 @@
 #include <arch/irq.h>
 #include <net/uip/uip-arch.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 #include "uip/uip-internal.h"
 
 /****************************************************************************
diff --git a/nuttx/net/setsockopt.c b/nuttx/net/setsockopt.c
index 0c4e3d9e4..41fe2e3c3 100644
--- a/nuttx/net/setsockopt.c
+++ b/nuttx/net/setsockopt.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/setsockopt.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <arch/irq.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/net/socket.c b/nuttx/net/socket.c
index d9d4e440b..5e24ea84f 100644
--- a/nuttx/net/socket.c
+++ b/nuttx/net/socket.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/netutils/webserver/Make.defs b/nuttx/netutils/webserver/Make.defs
index ca3567861..50fa37cf2 100644
--- a/nuttx/netutils/webserver/Make.defs
+++ b/nuttx/netutils/webserver/Make.defs
@@ -34,4 +34,4 @@
 ############################################################################
 
 WEBSERVER_ASRCS =
-WEBSERVER_CSRCS = httpd.c httpd-fs.c httpd-cgi.c
+WEBSERVER_CSRCS = httpd.c httpd_fs.c httpd_cgi.c
diff --git a/nuttx/netutils/webserver/httpd.c b/nuttx/netutils/webserver/httpd.c
index 6f1f6dc6e..195b61996 100644
--- a/nuttx/netutils/webserver/httpd.c
+++ b/nuttx/netutils/webserver/httpd.c
@@ -62,7 +62,7 @@
 #include <net/uip/httpd.h>
 
 #include "httpd.h"
-#include "httpd-cgi.h"
+#include "httpd_cgi.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/netutils/webserver/httpd-cgi.c b/nuttx/netutils/webserver/httpd_cgi.c
index 3398e7a7b..d5b79c22b 100644
--- a/nuttx/netutils/webserver/httpd-cgi.c
+++ b/nuttx/netutils/webserver/httpd_cgi.c
@@ -1,4 +1,4 @@
-/* httpd-cgi.c
+/* httpd_cgi.c
  * Web server script interface
  * Author: Adam Dunkels <adam@sics.se>
  *
@@ -39,7 +39,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/httpd.h>
 
-#include "httpd-cgi.h"
+#include "httpd_cgi.h"
 
 #define CONFIG_HTTPDCGI_FILESTATS 1
 #undef CONFIG_HTTPDCGI_DCPSTATS
diff --git a/nuttx/netutils/webserver/httpd-cgi.h b/nuttx/netutils/webserver/httpd_cgi.h
index c6128513c..f56176778 100644
--- a/nuttx/netutils/webserver/httpd-cgi.h
+++ b/nuttx/netutils/webserver/httpd_cgi.h
@@ -1,4 +1,4 @@
-/* httpd-cgi.h
+/* httpd_cgi.h
  * Web server script interface header file
  * Author: Adam Dunkels <adam@sics.se>
  *
diff --git a/nuttx/netutils/webserver/httpd-fs.c b/nuttx/netutils/webserver/httpd_fs.c
index f479aabaa..0528f6ed2 100644
--- a/nuttx/netutils/webserver/httpd-fs.c
+++ b/nuttx/netutils/webserver/httpd_fs.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * netutils/webserver/httpd-fs.c
+ * netutils/webserver/httpd_fs.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -46,13 +46,13 @@
 #include <net/uip/httpd.h>
 
 #include "httpd.h"
-#include "httpd-fsdata.h"
+#include "httpd_fsdata.h"
 
 #ifndef NULL
 #define NULL 0
 #endif /* NULL */
 
-#include "httpd-fsdata.c"
+#include "httpd_fsdata.c"
 
 #if HTTPD_FS_STATISTICS
 static uint16 count[HTTPD_FS_NUMFILES];
diff --git a/nuttx/netutils/webserver/httpd-fsdata.c b/nuttx/netutils/webserver/httpd_fsdata.c
index 4fd1d7b7b..4fd1d7b7b 100644
--- a/nuttx/netutils/webserver/httpd-fsdata.c
+++ b/nuttx/netutils/webserver/httpd_fsdata.c
diff --git a/nuttx/netutils/webserver/httpd-fsdata.h b/nuttx/netutils/webserver/httpd_fsdata.h
index bc5a6659f..eab255afa 100644
--- a/nuttx/netutils/webserver/httpd-fsdata.h
+++ b/nuttx/netutils/webserver/httpd_fsdata.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * netutils/webserver/httpd-fsdata.h
+ * netutils/webserver/httpd_fsdata.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -53,9 +53,9 @@
 struct httpd_fsdata_file
 {
   const struct httpd_fsdata_file *next;
-  const unsigned char *name;
-  const unsigned char *data;
-  const int len;
+  FAR const ubyte *name;
+  FAR const ubyte *data;
+  int len;
 #ifdef HTTPD_FS_STATISTICS
 #if HTTPD_FS_STATISTICS == 1
   uint16 count;
@@ -65,9 +65,9 @@ struct httpd_fsdata_file
 
 struct httpd_fsdata_file_noconst
 {
-  struct httpd_fsdata_file *next;
-  char *name;
-  char *data;
+  FAR struct httpd_fsdata_file *next;
+  FAR char *name;
+  FAR char *data;
   int len;
 #ifdef HTTPD_FS_STATISTICS
 #if HTTPD_FS_STATISTICS == 1