summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/src2html.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-04-27 09:18:17 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-04-27 09:18:17 +0000
commit9eb86548bbb847ca2fc01f04fc3a4caa3568aefe (patch)
tree7bc8d0a67746251f1ec2dc38d52a1e8da5c381be /src/tools/src2html.c
parent5d4816b66528f07a78ce8470413c524cbb57c799 (diff)
Added missing casts and made other tweaks. The entire project
can now be optionally compiled with the C++ compiler (mingw g++ only for the moment; MSVC still has issues).
Diffstat (limited to 'src/tools/src2html.c')
-rw-r--r--src/tools/src2html.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/src2html.c b/src/tools/src2html.c
index 0b5322d516b..6f5719f74b6 100644
--- a/src/tools/src2html.c
+++ b/src/tools/src2html.c
@@ -181,8 +181,8 @@ static int recurse_dir(int srcrootlen, int dstrootlen, const astring *srcdir, co
static int output_file(file_type type, int srcrootlen, int dstrootlen, const astring *srcfile, const astring *dstfile, int link_to_file, const astring *tempheader, const astring *tempfooter);
/* HTML helpers */
-static core_file *create_file_and_output_header(const astring *filename, const astring *template, const astring *path);
-static void output_footer_and_close_file(core_file *file, const astring *template, const astring *path);
+static core_file *create_file_and_output_header(const astring *filename, const astring *templatefile, const astring *path);
+static void output_footer_and_close_file(core_file *file, const astring *templatefile, const astring *path);
/* path helpers */
static const astring *normalized_subpath(const astring *path, int start);
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
/* include path? */
if (arg[0] == '-' && arg[1] == 'I')
{
- *incpathhead = malloc(sizeof(**incpathhead));
+ *incpathhead = (include_path *)malloc(sizeof(**incpathhead));
if (*incpathhead != NULL)
{
(*incpathhead)->next = NULL;
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
/* read the template file into an astring */
if (core_fload(astring_c(tempfilename), &buffer, &bufsize) == FILERR_NONE)
{
- tempheader = astring_dupch(buffer, bufsize);
+ tempheader = astring_dupch((const char *)buffer, bufsize);
free(buffer);
}
@@ -353,7 +353,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, const astring *srcdir, co
while ((entry = osd_readdir(dir)) != NULL)
if (entry->type == entry_type && entry->name[0] != '.')
{
- list_entry *lentry = malloc(sizeof(*lentry));
+ list_entry *lentry = (list_entry *)malloc(sizeof(*lentry));
lentry->name = astring_dupc(entry->name);
lentry->next = list;
list = lentry;
@@ -368,7 +368,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, const astring *srcdir, co
continue;
/* allocate memory for sorting */
- listarray = malloc(sizeof(list_entry *) * found);
+ listarray = (list_entry **)malloc(sizeof(list_entry *) * found);
found = 0;
for (curlist = list; curlist != NULL; curlist = curlist->next)
listarray[found++] = curlist;
@@ -734,7 +734,7 @@ static int output_file(file_type type, int srcrootlen, int dstrootlen, const ast
HTML file with a standard header
-------------------------------------------------*/
-static core_file *create_file_and_output_header(const astring *filename, const astring *template, const astring *path)
+static core_file *create_file_and_output_header(const astring *filename, const astring *templatefile, const astring *path)
{
astring *modified;
core_file *file;
@@ -744,7 +744,7 @@ static core_file *create_file_and_output_header(const astring *filename, const a
return NULL;
/* print a header */
- modified = astring_dup(template);
+ modified = astring_dup(templatefile);
astring_replacec(modified, 0, "<!--PATH-->", astring_c(path));
core_fwrite(file, astring_c(modified), astring_len(modified));
@@ -759,11 +759,11 @@ static core_file *create_file_and_output_header(const astring *filename, const a
standard footer to an HTML file and close it
-------------------------------------------------*/
-static void output_footer_and_close_file(core_file *file, const astring *template, const astring *path)
+static void output_footer_and_close_file(core_file *file, const astring *templatefile, const astring *path)
{
astring *modified;
- modified = astring_dup(template);
+ modified = astring_dup(templatefile);
astring_replacec(modified, 0, "<!--PATH-->", astring_c(path));
core_fwrite(file, astring_c(modified), astring_len(modified));
astring_free(modified);