aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIto Hiroyuki <ZXB01226@nifty.com>2010-08-09 11:59:19 +0000
committerIto Hiroyuki <ZXB01226@nifty.com>2010-08-09 11:59:19 +0000
commit80cb7d241d9cd8fb66a7421b1a01ecb64b1611b0 (patch)
tree388318f75a6e559ef7251c794002014208f9d1d9
parenthttps://bugs.launchpad.net/ubuntu/+source/w3m/+bug/131993 (diff)
downloadw3m-80cb7d241d9cd8fb66a7421b1a01ecb64b1611b0.tar.gz
w3m-80cb7d241d9cd8fb66a7421b1a01ecb64b1611b0.zip
* [w3m-dev 04375] Re: "important" bugs from bugs.debian.org
* table.c (feed_table_tag): don't show message when rowspan is greater than ATTR_ROWSPAN_MAX * [w3m-dev 04376] Re: "important" bugs from bugs.debian.org * table.c (feed_table_tag): fix indent
Diffstat (limited to '')
-rw-r--r--ChangeLog9
-rw-r--r--table.c10
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c81c4c1..a820357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-09 Ito Hiroyuki <ZXB01226 at nifty.com>
+
+ * [w3m-dev 04375] Re: "important" bugs from bugs.debian.org
+ * table.c (feed_table_tag): don't show message when rowspan is greater than ATTR_ROWSPAN_MAX
+ * [w3m-dev 04376] Re: "important" bugs from bugs.debian.org
+ * table.c (feed_table_tag): fix indent
+
2010-08-08 Steven Harms <ZXB01226 at nifty.com>
* [w3m-dev 04371] Re: "important" bugs from bugs.debian.org
@@ -9123,4 +9130,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.1029 2010/08/08 10:14:32 htrb Exp $
+$Id: ChangeLog,v 1.1030 2010/08/09 11:59:19 htrb Exp $
diff --git a/table.c b/table.c
index dbe874c..e1243ff 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.57 2010/08/08 10:14:32 htrb Exp $ */
+/* $Id: table.c,v 1.58 2010/08/09 11:59:19 htrb Exp $ */
/*
* HTML table
*/
@@ -2594,11 +2594,9 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
else
valign = HTT_MIDDLE;
if (parsedtag_get_value(tag, ATTR_ROWSPAN, &rowspan)) {
- if(rowspan > ATTR_ROWSPAN_MAX)
- {
- fprintf(stderr, " Table Rowspan too large. Limiting to %d.\n", ATTR_ROWSPAN_MAX);
- rowspan = ATTR_ROWSPAN_MAX;
- }
+ if(rowspan > ATTR_ROWSPAN_MAX) {
+ rowspan = ATTR_ROWSPAN_MAX;
+ }
if ((tbl->row + rowspan) >= tbl->max_rowsize)
check_row(tbl, tbl->row + rowspan);
}