projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chart: Fix format string issues in draw_tick callers.
[pspp-builds.git]
/
src
/
output
/
html.c
diff --git
a/src/output/html.c
b/src/output/html.c
index 893c18527b7ff30e431762ede6658332e6fc5e46..bfe0850d5f8f9bc3d53133ea52399ae8d93b7312 100644
(file)
--- a/
src/output/html.c
+++ b/
src/output/html.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-47,23
+47,25
@@
static void escape_string (FILE *file,
const char *text, size_t length,
const char *space);
static void escape_string (FILE *file,
const char *text, size_t length,
const char *space);
-static bool handle_option (
struct outp_driver
*this,
+static bool handle_option (
void
*this,
const char *key, const struct string *val);
static void print_title_tag (FILE *file, const char *name,
const char *content);
static bool
const char *key, const struct string *val);
static void print_title_tag (FILE *file, const char *name,
const char *content);
static bool
-html_open_driver (
struct outp_driver *thi
s, struct substring options)
+html_open_driver (
const char *name, int type
s, struct substring options)
{
{
+ struct outp_driver *this;
struct html_driver_ext *x;
struct html_driver_ext *x;
+ this = outp_allocate_driver (&html_class, name, types);
this->ext = x = xmalloc (sizeof *x);
x->file_name = xstrdup ("pspp.html");
x->chart_file_name = xstrdup ("pspp-#.png");
x->file = NULL;
x->chart_cnt = 0;
this->ext = x = xmalloc (sizeof *x);
x->file_name = xstrdup ("pspp.html");
x->chart_file_name = xstrdup ("pspp-#.png");
x->file = NULL;
x->chart_cnt = 0;
- outp_parse_options (options, handle_option, this);
+ outp_parse_options (
name,
options, handle_option, this);
x->file = fn_open (x->file_name, "w");
if (x->file == NULL)
x->file = fn_open (x->file_name, "w");
if (x->file == NULL)
@@
-89,10
+91,12
@@
html_open_driver (struct outp_driver *this, struct substring options)
print_title_tag (x->file, "H1", outp_title);
print_title_tag (x->file, "H2", outp_subtitle);
print_title_tag (x->file, "H1", outp_title);
print_title_tag (x->file, "H2", outp_subtitle);
+ outp_register_driver (this);
return true;
error:
this->class->close_driver (this);
return true;
error:
this->class->close_driver (this);
+ outp_free_driver (this);
return false;
}
return false;
}
@@
-157,9
+161,9
@@
static const struct outp_option option_tab[] =
};
static bool
};
static bool
-handle_option (struct outp_driver *this,
- const char *key, const struct string *val)
+handle_option (void *this_, const char *key, const struct string *val)
{
{
+ struct outp_driver *this = this_;
struct html_driver_ext *x = this->ext;
int subcat;
struct html_driver_ext *x = this->ext;
int subcat;