Internationalisation.

[pspp-builds.git] / src / output / html.c

diff --git a/src/output/html.c b/src/output/html.c
index 7451efdc381d47ee4da21300a418604621b4d8a6..d5b4f5d4fb8d2443fde655cf3a6334144d3e0deb 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -20,7 +20,6 @@
 #include <config.h>
 #include "chart.h"
 #include "htmlP.h"
-#include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -29,8 +28,7 @@
 
 #include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <data/filename.h>
+#include <data/file-name.h>
 #include "error.h"
 #include "getline.h"
 #include "getlogin_r.h"
@@ -52,7 +50,7 @@ static void print_title_tag (FILE *file, const char *name,
                              const char *content);
 
 static bool
-html_open_driver (struct outp_driver *this, const char *options)
+html_open_driver (struct outp_driver *this, const struct string *options)
 {
   struct html_driver_ext *x;
 
@@ -192,7 +190,7 @@ html_submit (struct outp_driver *this, struct som_entity *s)
       output_tab_table ( this, (struct tab_table *) s->ext);
       break;
     case SOM_CHART:
-      link_image (x->file, ((struct chart *)s->ext)->filename);
+      link_image (x->file, ((struct chart *)s->ext)->file_name);
       break;
     default:
       abort ();
@@ -347,7 +345,7 @@ html_initialise_chart(struct outp_driver *d UNUSED, struct chart *ch)
 
   FILE  *fp;
 
-  make_unique_file_stream(&fp, &ch->filename);
+  make_unique_file_stream(&fp, &ch->file_name);
 
 #ifdef NO_CHARTS
   ch->lp = 0;
@@ -361,7 +359,7 @@ html_initialise_chart(struct outp_driver *d UNUSED, struct chart *ch)
 static void 
 html_finalise_chart(struct outp_driver *d UNUSED, struct chart *ch)
 {
-  free(ch->filename);
+  free(ch->file_name);
 }