summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-09-04 19:02:47 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-09-04 19:02:47 +0000
commita0273651341bae53f841583ca90413bb5e155113 (patch)
treeecd28ecc9e4e0a2c57813aeef3ccb02b7e6a9d98
parentd70b4e74967e86dfdd4f7f60ab144868c730337b (diff)
2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* init.c: Remove TARFILE_XXX macros.
-rw-r--r--http/ChangeLog4
-rw-r--r--http/init.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/http/ChangeLog b/http/ChangeLog
index 815be6d..ea6bbe7 100644
--- a/http/ChangeLog
+++ b/http/ChangeLog
@@ -1,5 +1,9 @@
2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * init.c: Remove TARFILE_XXX macros.
+
+2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* Makefile: Use bin2c to more reliably turn the tarfile into a
linkable object file. Ignore .cvsignore when making tarfile.
* init.c: Clean up tarfile symbol definitions.
diff --git a/http/init.c b/http/init.c
index 872a6bb..f6f64d3 100644
--- a/http/init.c
+++ b/http/init.c
@@ -56,8 +56,6 @@
* The tarfile image is built automatically externally.
*/
#include "FilesystemImage.h"
-#define TARFILE_START FilesystemImage
-#define TARFILE_SIZE FilesystemImage_size
#if defined(USE_FTPD)
boolean FTPD_enabled = TRUE;
@@ -110,7 +108,7 @@ rtems_task Init(
* Load filesystem image
*/
printf("Loading filesystem image");
- status = Untar_FromMemory((void *)(&TARFILE_START), (size_t)&TARFILE_SIZE);
+ status = Untar_FromMemory( (char *)FilesystemImage, FilesystemImage_size );
printf("Initializing Network");
rtems_bsdnet_initialize_network ();