X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=d2c5312ff67306881ecdd6a08d71a0fae7862c87;hb=7693a37f77880e38d26af908cdb21710d631ad5a;hp=72ca57d9227a5757ed18c06893f840afa72762af;hpb=5beffdda43634370653661d5a0f5e3c75aa28747;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 72ca57d922..d2c5312ff6 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +31,6 @@ #include #include "error.h" #include "getline.h" -#include "getlogin_r.h" #include "output.h" #include "manager.h" #include "table.h" @@ -149,7 +147,7 @@ enum }; /* All the options that the HTML driver supports. */ -static struct outp_option option_tab[] = +static const struct outp_option option_tab[] = { {"output-file", string_arg, 0}, {"chart-files", string_arg, 1}, @@ -361,7 +359,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) } static void -html_initialise_chart (struct outp_driver *this, struct chart *ch) +html_initialise_chart (struct outp_driver *this UNUSED, struct chart *ch) { #ifdef NO_CHARTS ch->lp = NULL; @@ -376,7 +374,7 @@ html_initialise_chart (struct outp_driver *this, struct chart *ch) number_pos = strchr (x->chart_file_name, '#') - x->chart_file_name; ch->file_name = xasprintf ("%.*s%d%s", number_pos, x->chart_file_name, - x->chart_cnt, + (int) x->chart_cnt, x->chart_file_name + number_pos + 1); fp = fopen (ch->file_name, "wb"); if (fp == NULL) @@ -401,7 +399,7 @@ html_finalise_chart(struct outp_driver *d UNUSED, struct chart *ch) /* HTML driver class. */ -struct outp_class html_class = +const struct outp_class html_class = { "html", 1,