diff --git a/net/Makefile b/net/Makefile
index 97c758dd7baca74d9efc437b00322005345bcef7..7880a974ef53fd7c4099aac8d28de0c3b4892d31 100644
--- a/net/Makefile
+++ b/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/net/accept.c b/net/accept.c
index f4c54e5f345aff7fc064b2ebf50b7bbd8730f648..a3a2e067ef208e13089f5197f462bfe43cdce6e8 100644
--- a/net/accept.c
+++ b/net/accept.c
@@ -50,7 +50,7 @@
#include <arch/irq.h>
-#include "net-internal.h"
+#include "net_internal.h"
/****************************************************************************
* Definitions
diff --git a/net/bind.c b/net/bind.c
index d75245c8a2c4f12753e8c4e7eb4020aa0a6f063a..381a554bbcec0f4fc8cd841e37092d2adb286d2b 100644
--- a/net/bind.c
+++ b/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/net/connect.c b/net/connect.c
index 3bb28638ccd0348ff2dbe91062fd3e4b9117b2f3..917049be9d2abaff4f7445dc9ad8b92b19c3164d 100644
--- a/net/connect.c
+++ b/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/net/getsockopt.c b/net/getsockopt.c
index 5b96762c0014188094ca21efe32b854763867197..186de82af45845c43fd81072e920337ead7b4174 100644
--- a/net/getsockopt.c
+++ b/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/net/listen.c b/net/listen.c
index 46bad5d94d1496aa1c8c0c92a394883a8f1c893d..b4d519d9b7e24a27e4cc12e509ffa481cf35ed03 100644
--- a/net/listen.c
+++ b/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/net/net-arptimer.c b/net/net_arptimer.c
similarity index 97%
rename from net/net-arptimer.c
rename to net/net_arptimer.c
index bbb4ef6cb7855ba54cbe2f1b9c814a96e724764b..e3c281c387188d7e74b063f8e337fe6f5cc3cee5 100644
--- a/net/net-arptimer.c
+++ b/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/net/net-close.c b/net/net_close.c
similarity index 98%
rename from net/net-close.c
rename to net/net_close.c
index 1f704ca00032ff1e9539981149e01440f65ad5cf..d94d7cc43c39cc8842c0a873bd6bc0bde2c320e6 100644
--- a/net/net-close.c
+++ b/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/net/net-dsec2timeval.c b/net/net_dsec2timeval.c
similarity index 96%
rename from net/net-dsec2timeval.c
rename to net/net_dsec2timeval.c
index 0ff1ab2c2901d6608fbc858d28ac94ba6bf98380..f447b91bf279413ff380183a57bc20f26414cad1 100644
--- a/net/net-dsec2timeval.c
+++ b/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/net/net-internal.h b/net/net_internal.h
similarity index 99%
rename from net/net-internal.h
rename to net/net_internal.h
index 37d22c280d97c3b79ef26e7e2585586966b56884..ebef372f91d39b0c4e8fbdc8bcfdb414987dab54 100644
--- a/net/net-internal.h
+++ b/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/net/net-poll.c b/net/net_poll.c
similarity index 99%
rename from net/net-poll.c
rename to net/net_poll.c
index 6dcb4c2d0a86062c87c48d30c144c5ede8fdbc5f..2e5eea122d471fd6e2b94a61d54b4dae1f1beb72 100644
--- a/net/net-poll.c
+++ b/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/net/net-sockets.c b/net/net_sockets.c
similarity index 99%
rename from net/net-sockets.c
rename to net/net_sockets.c
index 8463f63d8b6562896308dcd449fdaec1b758ce6c..cda0c105e9322b0905dac90d72f130ff3b77dab2 100644
--- a/net/net-sockets.c
+++ b/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/net/net-timeo.c b/net/net_timeo.c
similarity index 96%
rename from net/net-timeo.c
rename to net/net_timeo.c
index 0bc25c03060b4e1f9a28fa3aee23e28206c519af..e4b95d4ced8500cbe8752ead8d8bff1e810eca84 100644
--- a/net/net-timeo.c
+++ b/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/net/net-timeval2dsec.c b/net/net_timeval2dsec.c
similarity index 96%
rename from net/net-timeval2dsec.c
rename to net/net_timeval2dsec.c
index eb68fc4e537003994259cd06ea7331ae697d3309..87f6b0966aad3eb8f5b3c75137eea14ee5a9fec4 100644
--- a/net/net-timeval2dsec.c
+++ b/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/net/netdev-count.c b/net/netdev_count.c
similarity index 97%
rename from net/netdev-count.c
rename to net/netdev_count.c
index c4ca49fd54e8987e76e0a9b3764daae2e792606f..5550b28c4f8bc6516f9c676bc8798db840efa8f7 100644
--- a/net/netdev-count.c
+++ b/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/net/netdev-findbyaddr.c b/net/netdev_findbyaddr.c
similarity index 97%
rename from net/netdev-findbyaddr.c
rename to net/netdev_findbyaddr.c
index ff4cd7a6df24990854ce0366c0e3307d1e226a8a..1b326b3ba0de886f1bef89299df71af9cfb4d0c2 100644
--- a/net/netdev-findbyaddr.c
+++ b/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/net/netdev-findbyname.c b/net/netdev_findbyname.c
similarity index 97%
rename from net/netdev-findbyname.c
rename to net/netdev_findbyname.c
index 6c3d59ae3524de9b7a381c1b4fb4e495216945f2..3a9db0c0d75dd1052b7e58ed82d7d4d510c181d9 100644
--- a/net/netdev-findbyname.c
+++ b/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/net/netdev-foreach.c b/net/netdev_foreach.c
similarity index 97%
rename from net/netdev-foreach.c
rename to net/netdev_foreach.c
index 54472eb98bc7686417e606f12e3ff479c5d2732a..760ed20c830653c56ae94ecdb0ac193f328253e3 100644
--- a/net/netdev-foreach.c
+++ b/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/net/netdev-ioctl.c b/net/netdev_ioctl.c
similarity index 98%
rename from net/netdev-ioctl.c
rename to net/netdev_ioctl.c
index f54362ff3f8e9390ab3becc973cf37bede826518..c80f75e4ff53418bded431278c2429c007a799ec 100644
--- a/net/netdev-ioctl.c
+++ b/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/net/netdev-register.c b/net/netdev_register.c
similarity index 97%
rename from net/netdev-register.c
rename to net/netdev_register.c
index 5f06b665b77e029f602e462841c3361ed6190da3..86d8bf83f406d9d33a2a52116ad56f0214d9b9a3 100644
--- a/net/netdev-register.c
+++ b/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/net/netdev-txnotify.c b/net/netdev_txnotify.c
similarity index 97%
rename from net/netdev-txnotify.c
rename to net/netdev_txnotify.c
index c600e34d38a22039197508fad243ac7bfd5235cc..0fd03b0c3c3f0f98fd7e93c95cfc217c04c39788 100644
--- a/net/netdev-txnotify.c
+++ b/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/net/recv.c b/net/recv.c
index 135b6f31913e4027212f72702a3d723d1e3f2847..3d5b82f2c2f4281b953e3b939e238fb4f54b1d27 100644
--- a/net/recv.c
+++ b/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/net/recvfrom.c b/net/recvfrom.c
index 0d0a24db8f6d7891653cccc1122560ae2883e012..a74f9c8bd90e14b175641f18701d63049a8baa92 100644
--- a/net/recvfrom.c
+++ b/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/net/send.c b/net/send.c
index 74a96f7f80b71426ad02732e6f31066489ad3fca..06e1c7177bfb4296d59aee6490a1d99c9c54ca8a 100644
--- a/net/send.c
+++ b/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/net/sendto.c b/net/sendto.c
index 57c37668b22eb19526566d28520d0fccafe70581..acf1ea0c888c4286e70e3484df4d634ee049a08a 100644
--- a/net/sendto.c
+++ b/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/net/setsockopt.c b/net/setsockopt.c
index 0c4e3d9e414d1202ddd7a0f0dbc77e62931eb07e..41fe2e3c3105af31f22bd61b5a670a7e577a2457 100644
--- a/net/setsockopt.c
+++ b/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/net/socket.c b/net/socket.c
index d9d4e440b9044a9197e71f108e386abc76c9d44a..5e24ea84f3231fd9755af835d41d19993fd231a0 100644
--- a/net/socket.c
+++ b/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/netutils/webserver/Make.defs b/netutils/webserver/Make.defs
index ca35678617d317635bd7abc357ff4606e1b2eaf1..50fa37cf21d86909e9d2477bc404bbb710ef619f 100644
--- a/netutils/webserver/Make.defs
+++ b/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/netutils/webserver/httpd.c b/netutils/webserver/httpd.c
index 6f1f6dc6ed4aed006c052c98ab001b42a9484d9d..195b619965eefd03b1c97d7e602ee7696d466ef7 100644
--- a/netutils/webserver/httpd.c
+++ b/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/netutils/webserver/httpd-cgi.c b/netutils/webserver/httpd_cgi.c
similarity index 99%
rename from netutils/webserver/httpd-cgi.c
rename to netutils/webserver/httpd_cgi.c
index 3398e7a7b41999003abc5c24b0d2098bc7c696b3..d5b79c22ba02cd85183742515a3eaf57ff96037c 100644
--- a/netutils/webserver/httpd-cgi.c
+++ b/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/netutils/webserver/httpd-cgi.h b/netutils/webserver/httpd_cgi.h
similarity index 99%
rename from netutils/webserver/httpd-cgi.h
rename to netutils/webserver/httpd_cgi.h
index c6128513ce9aa8a7da9ed56c444e9e194f6317f0..f5617677865609cde24358ffc3f419e205dd786b 100644
--- a/netutils/webserver/httpd-cgi.h
+++ b/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/netutils/webserver/httpd-fs.c b/netutils/webserver/httpd_fs.c
similarity index 96%
rename from netutils/webserver/httpd-fs.c
rename to netutils/webserver/httpd_fs.c
index f479aabaaf889d1a3bdfafbf396446623102fc6e..0528f6ed24eb650ae95e53d327ea8c978a548da7 100644
--- a/netutils/webserver/httpd-fs.c
+++ b/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/netutils/webserver/httpd-fsdata.c b/netutils/webserver/httpd_fsdata.c
similarity index 100%
rename from netutils/webserver/httpd-fsdata.c
rename to netutils/webserver/httpd_fsdata.c
diff --git a/netutils/webserver/httpd-fsdata.h b/netutils/webserver/httpd_fsdata.h
similarity index 92%
rename from netutils/webserver/httpd-fsdata.h
rename to netutils/webserver/httpd_fsdata.h
index bc5a6659f150879d41bd2688e0ef0c0c36502217..eab255afa99c2c83e4c46f9f589841d07815d947 100644
--- a/netutils/webserver/httpd-fsdata.h
+++ b/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