Filename changes needed by ZDS archiver

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

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_CSRCS	= netdev_register.c netdev_ioctl.c net_poll.c netdev_txnotify.c \
-		  netdev-findbyname.c netdev-findbyaddr.c netdev-count.c \
+		  netdev_findbyname.c netdev_findbyaddr.c netdev_count.c \
-		  netdev-foreach.c
+		  netdev_foreach.c
 
 include uip/Make.defs
 endif

net/accept.c

@@ -50,7 +50,7 @@
 
 #include <arch/irq.h>
 
-#include "net-internal.h"
+#include "net_internal.h"
 
 /****************************************************************************
  * Definitions

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

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"
 
 /****************************************************************************

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

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

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

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"
 
 /****************************************************************************

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

net/net_internal.h

@@ -47,8 +47,6 @@
 #include <nuttx/net.h>
 #include <net/uip/uip.h>
 
-#include "net-internal.h"
-
 /****************************************************************************
  * Definitions
  ****************************************************************************/

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

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

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

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

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

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

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

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

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

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

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

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

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"
 
 /****************************************************************************

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"
 
 /****************************************************************************

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"
 
 /****************************************************************************

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

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

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

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

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

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>
  *

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];

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;
+  FAR const ubyte *name;
-  const unsigned char *data;
+  FAR const ubyte *data;
-  const int len;
+  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;
+  FAR struct httpd_fsdata_file *next;
-  char *name;
+  FAR char *name;
-  char *data;
+  FAR char *data;
   int len;
 #ifdef HTTPD_FS_STATISTICS
 #if HTTPD_FS_STATISTICS == 1