summaryrefslogtreecommitdiff
path: root/nuttx/netutils/webserver
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-12-12 18:33:36 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-12-12 18:33:36 +0000
commit58205f362144d4133ccd8a691b4bd973e147db21 (patch)
tree6d903ede663beec98cfd7a78b45ed8b7b755dd2e /nuttx/netutils/webserver
parent101602413fe057426c1aed2eb8c9f97e84cbf040 (diff)
downloadpx4-nuttx-58205f362144d4133ccd8a691b4bd973e147db21.tar.gz
px4-nuttx-58205f362144d4133ccd8a691b4bd973e147db21.tar.bz2
px4-nuttx-58205f362144d4133ccd8a691b4bd973e147db21.zip
Filename changes needed by ZDS archiver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1452 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/netutils/webserver')
-rw-r--r--nuttx/netutils/webserver/Make.defs2
-rw-r--r--nuttx/netutils/webserver/httpd.c2
-rw-r--r--nuttx/netutils/webserver/httpd_cgi.c (renamed from nuttx/netutils/webserver/httpd-cgi.c)4
-rw-r--r--nuttx/netutils/webserver/httpd_cgi.h (renamed from nuttx/netutils/webserver/httpd-cgi.h)2
-rw-r--r--nuttx/netutils/webserver/httpd_fs.c (renamed from nuttx/netutils/webserver/httpd-fs.c)8
-rw-r--r--nuttx/netutils/webserver/httpd_fsdata.c (renamed from nuttx/netutils/webserver/httpd-fsdata.c)0
-rw-r--r--nuttx/netutils/webserver/httpd_fsdata.h (renamed from nuttx/netutils/webserver/httpd-fsdata.h)16
7 files changed, 17 insertions, 17 deletions
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