[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ChangeLog src/devices/grohtml/html-text.c...
From: |
Werner LEMBERG |
Subject: |
[Groff-commit] groff ChangeLog src/devices/grohtml/html-text.c... |
Date: |
Mon, 31 Oct 2011 07:25:19 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 11/10/31 07:25:19
Modified files:
. : ChangeLog
src/devices/grohtml: html-text.cpp post-html.cpp
src/preproc/eqn: main.cpp
src/roff/troff : env.cpp mtsm.cpp
src/utils/tfmtodit: tfmtodit.cpp
Log message:
Fix compiler warnings.
* src/preproc/eqn/main.cpp (do_file), src/roff/troff/env.cpp
(environment::print_env), src/roff/troff/mtsm.cpp
(statem::display_state): Add syntactical sugar.
* src/utils/tfmtodit/tfmtodit.cpp (char_info_word): Use `unsigned
char' for all members.
* src/devices/grohtml/html-text.cpp (html_text::remove_def): Remove
unused variable `q'.
* src/devices/grohtml/post-html.cpp
(html_printer::lookahead_for_tables): Remove unused variable `left'
and `seen_text'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1309&r2=1.1310
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/grohtml/html-text.cpp?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/grohtml/post-html.cpp?cvsroot=groff&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/eqn/main.cpp?cvsroot=groff&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/env.cpp?cvsroot=groff&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/mtsm.cpp?cvsroot=groff&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/groff/src/utils/tfmtodit/tfmtodit.cpp?cvsroot=groff&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1309
retrieving revision 1.1310
diff -u -b -r1.1309 -r1.1310
--- ChangeLog 29 Oct 2011 16:44:31 -0000 1.1309
+++ ChangeLog 31 Oct 2011 07:25:18 -0000 1.1310
@@ -1,3 +1,20 @@
+2011-10-31 Werner LEMBERG <address@hidden>
+
+ Fix compiler warnings.
+
+ * src/preproc/eqn/main.cpp (do_file), src/roff/troff/env.cpp
+ (environment::print_env), src/roff/troff/mtsm.cpp
+ (statem::display_state): Add syntactical sugar.
+
+ * src/utils/tfmtodit/tfmtodit.cpp (char_info_word): Use `unsigned
+ char' for all members.
+
+ * src/devices/grohtml/html-text.cpp (html_text::remove_def): Remove
+ unused variable `q'.
+ * src/devices/grohtml/post-html.cpp
+ (html_printer::lookahead_for_tables): Remove unused variable `left'
+ and `seen_text'.
+
2011-10-23 Ingo Schwarze <address@hidden>
[mdoc] Synchronize string tables with the mandoc(1) utility.
Index: src/devices/grohtml/html-text.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/grohtml/html-text.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/devices/grohtml/html-text.cpp 5 Jan 2009 20:10:55 -0000 1.13
+++ src/devices/grohtml/html-text.cpp 31 Oct 2011 07:25:18 -0000 1.14
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009
+/* Copyright (C) 2000-2005, 2007, 2009, 2011
* Free Software Foundation, Inc.
*
* Gaius Mulley (address@hidden) wrote html-text.cpp
@@ -875,7 +875,6 @@
{
tag_definition *p = stackptr;
tag_definition *l = 0;
- tag_definition *q = 0;
while ((p != 0) && (p != t)) {
l = p;
@@ -886,12 +885,10 @@
stackptr = stackptr->next;
if (stackptr == NULL)
lastptr = NULL;
- q = stackptr;
} else if (l == 0) {
error("stack list pointers are wrong");
} else {
l->next = p->next;
- q = p->next;
if (l->next == NULL)
lastptr = l;
}
Index: src/devices/grohtml/post-html.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/grohtml/post-html.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/devices/grohtml/post-html.cpp 25 Feb 2010 19:34:08 -0000 1.45
+++ src/devices/grohtml/post-html.cpp 31 Oct 2011 07:25:18 -0000 1.46
@@ -1,6 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
- * 2010
+/* Copyright (C) 2000-2007, 2009-2011
* Free Software Foundation, Inc.
*
* Gaius Mulley (address@hidden) wrote post-html.cpp
@@ -3614,9 +3613,7 @@
text_glob *start_of_table = NULL;
text_glob *last = NULL;
colType type_of_col = none;
- int left = 0;
int found_col = FALSE;
- int seen_text = FALSE;
int ncol = 0;
int colmin = 0; // pacify compiler
int colmax = 0; // pacify compiler
@@ -3646,9 +3643,7 @@
}
start_of_line = g;
- seen_text = FALSE;
ncol = 0;
- left = next_horiz_pos(g, nf);
if (found_col)
last = g;
found_col = FALSE;
@@ -3713,14 +3708,10 @@
} else if (! g->is_a_tag())
update_min_max(type_of_col, &colmin, &colmax, g);
- if ((! g->is_a_tag()) || g->is_tab())
- seen_text = TRUE;
-
if ((g->is_col() || g->is_tab() || g->is_tab0())
&& (start_of_line != NULL) && (start_of_table == NULL)) {
start_of_table = insert_tab_ts(start_of_line);
start_of_line = NULL;
- seen_text = FALSE;
} else if (g->is_ce() && (start_of_table != NULL)) {
add_table_end("*** CE ***");
start_of_table->remember_table(tbl);
@@ -3782,9 +3773,7 @@
nf = calc_nf(g, nf);
} while ((g != NULL) && (g->is_br() || (nf && g->is_eol())));
start_of_line = g;
- seen_text = FALSE;
ncol = 0;
- left = next_horiz_pos(g, nf);
if (found_col)
last = g;
found_col = FALSE;
Index: src/preproc/eqn/main.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/eqn/main.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/preproc/eqn/main.cpp 5 Jan 2009 20:11:06 -0000 1.9
+++ src/preproc/eqn/main.cpp 31 Oct 2011 07:25:18 -0000 1.10
@@ -1,6 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2005, 2007,
- 2009
+/* Copyright (C) 1989-1992, 2000-2002, 2005, 2007, 2009, 2011
Free Software Foundation, Inc.
Written by James Clark (address@hidden)
@@ -112,13 +111,14 @@
inline_flag = 0;
yyparse();
restore_compatibility();
- if (non_empty_flag)
+ if (non_empty_flag) {
if (output_format == mathml)
putchar('\n');
else {
printf(".lf %d\n", current_lineno - 1);
output_string();
}
+ }
if (output_format == troff)
printf(".lf %d\n", current_lineno);
put_string(linebuf, stdout);
Index: src/roff/troff/env.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/env.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/roff/troff/env.cpp 24 Nov 2009 13:32:18 -0000 1.23
+++ src/roff/troff/env.cpp 31 Oct 2011 07:25:19 -0000 1.24
@@ -1,6 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2009
+/* Copyright (C) 1989-1992, 2000-2006, 2009, 2011
Free Software Foundation, Inc.
Written by James Clark (address@hidden)
@@ -3314,8 +3313,8 @@
? "on"
: margin_character_flags == MARGIN_CHARACTER_NEXT
? "next"
- : margin_character_flags == MARGIN_CHARACTER_ON
- | MARGIN_CHARACTER_NEXT
+ : margin_character_flags == (MARGIN_CHARACTER_ON
+ | MARGIN_CHARACTER_NEXT)
? "on, next"
: "none");
errprint(" margin character distance: %1u\n",
Index: src/roff/troff/mtsm.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/mtsm.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/roff/troff/mtsm.cpp 3 Jul 2011 19:33:57 -0000 1.8
+++ src/roff/troff/mtsm.cpp 31 Oct 2011 07:25:19 -0000 1.9
@@ -479,21 +479,24 @@
void statem::display_state()
{
fprintf(stderr, " <state ");
- if (bool_values[MTSM_BR].is_known)
+ if (bool_values[MTSM_BR].is_known) {
if (bool_values[MTSM_BR].value)
fprintf(stderr, "[br]");
else
fprintf(stderr, "[!br]");
- if (bool_values[MTSM_EOL].is_known)
+ }
+ if (bool_values[MTSM_EOL].is_known) {
if (bool_values[MTSM_EOL].value)
fprintf(stderr, "[eol]");
else
fprintf(stderr, "[!eol]");
- if (int_values[MTSM_SP].is_known)
+ }
+ if (int_values[MTSM_SP].is_known) {
if (int_values[MTSM_SP].value)
fprintf(stderr, "[sp %d]", int_values[MTSM_SP].value);
else
fprintf(stderr, "[!sp]");
+ }
fprintf(stderr, ">");
fflush(stderr);
}
Index: src/utils/tfmtodit/tfmtodit.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/utils/tfmtodit/tfmtodit.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/utils/tfmtodit/tfmtodit.cpp 5 Jan 2009 20:11:15 -0000 1.7
+++ src/utils/tfmtodit/tfmtodit.cpp 31 Oct 2011 07:25:19 -0000 1.8
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989-1992, 2000, 2001, 2004, 2009
+/* Copyright (C) 1989-1992, 2000, 2001, 2004, 2009, 2011
Free Software Foundation, Inc.
Written by James Clark (address@hidden)
@@ -66,10 +66,10 @@
struct char_info_word {
unsigned char width_index;
- char height_index;
- char depth_index;
- char italic_index;
- char tag;
+ unsigned char height_index;
+ unsigned char depth_index;
+ unsigned char italic_index;
+ unsigned char tag;
unsigned char remainder;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ChangeLog src/devices/grohtml/html-text.c...,
Werner LEMBERG <=