X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fhtml.c;h=38b89719a443095bf3456437a05b81bb6f6c450d;hb=7559bde1ff007c0ac0230fba30ae6c416148e171;hp=8b16ffa780d29d07fc6cf8e9a2fdbab233ccd0ae;hpb=d6cbbc8d634fa91f050661355139a4e4697e99ab;p=pspp
diff --git a/src/output/html.c b/src/output/html.c
index 8b16ffa780..38b89719a4 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017 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
@@ -51,7 +51,7 @@ struct html_driver
#ifdef HAVE_CAIRO
struct xr_color fg;
struct xr_color bg;
-#endif
+#endif
struct file_handle *handle;
char *chart_file_name;
@@ -407,7 +407,6 @@ html_output_table (struct html_driver *html, const struct table_item *item)
for (y = 0; y < table_nr (t); y++)
{
int x;
-
for (x = 0; x < table_nc (t); )
{
const struct cell_contents *c;
@@ -415,7 +414,7 @@ html_output_table (struct html_driver *html, const struct table_item *item)
table_get_cell (t, x, y, &cell);
if (y != cell.d[TABLE_VERT][0])
- continue;
+ goto next_0;
for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++)
{
@@ -432,6 +431,8 @@ html_output_table (struct html_driver *html, const struct table_item *item)
strlen (c->footnotes[i]), " ", "
");
}
}
+
+ next_0:
x = cell.d[TABLE_HORZ][1];
table_cell_free (&cell);
}
@@ -465,7 +466,7 @@ html_output_table (struct html_driver *html, const struct table_item *item)
table_get_cell (t, x, y, &cell);
if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
- continue;
+ goto next_1;
/* Output