* src/libs/libgroff/glyphuni.cpp (glyph_to_unicode_list),

src/libs/libgroff/uniglyph.cpp (unicode_to_glyph_list),
src/libs/libgroff/uniuni.cpp (unicode_decompose_list),
src/preproc/eqn/box.cpp (param_table), src/preproc/grn/hgraph.cpp
(polyfill), src/preproc/grn/main.cpp (polyfill),
src/preproc/refer/command.cpp (command_table),
src/utils/tfmtodit.cpp (lig_table): Don't use anonymous types (which
gcc 3.5 doesn't like).



Removing many compiler warnings.  groff should now compile with
a C++ compiler used for C files also.  [Simple variable renamings
to avoid shadowing aren't logged in detail.]

* src/devices/grodvi/dvi.cpp: Some local variable renamings.
(draw_dvi_printer::draw) ['c']: Enclose in block.

* src/devices/grohtml/post-html.cpp: Some local variable renamings.
(page::add_line): Fix typos.
* src/devices/grohtml/html-text.cpp: Some local variable renamings.

* src/devices/grolbp/lbp.cpp: Don't define _GNU_SOURCE.
Some local variable renamings.
* src/devices/grolbp/lbp.h: Some local variable renamings.

* src/devices/grolj4/lj4.cpp, src/devices/grotty/tty.cpp: Some local
variable renamings.

* src/libs/libbib/index.cpp (index_search_item_iterator::get_tag):
Remove redundant local variable declaration.
* src/libs/libbib/map.c (mapread, unmap): Don't use K&R style.
Don't use `caddr_t' but `void *'.
Enclose functions with `extern "C"' for C++.

* src/libs/libdriver/input.cpp (remember_filename,
remember_source_filename): Use cast for string constant.

* src/libs/libgroff/font.cpp, src/libs/libgroff/fontfile.cpp,
src/libs/libgroff/nametoindex.cpp, src/libs/libgroff/paper.cpp,
src/libs/libgroff/geometry.cpp: Some local variable renamings.
* src/libs/libgroff/iftoa.c, src/libs/libgroff/itoa.c: Don't use K&R
style.
Enclose functions with `extern "C"' for C++.
* src/libs/libgroff/quotearg.c (TRUE,FALSE): Define as macros.
(needs_quoting): Return `int'.
(quote_arg): Add proper casts to malloc and realloc.
* src/libs/libgroff/spawnvp.c: Compile code only for MS-DOS and
various MS Windows environments.
(spawnvp_wrapper): Add proper cast to malloc.

* src/preproc/eqn/box.h: Remove redundant declarations of
`make_script_box', `make_mark_box' and `make_lineup_box'.
* src/preproc/eqn/eqn.y: Remove redundant declaration of `strsave'.
* src/preproc/eqn/script.cpp, src/preproc/eqn/pile.cpp: Some local
variable renamings.

* src/preproc/grn/hpoint.cpp: Some local variable renamings.
* src/preproc/grn/hgraph.cpp: Some local variable renamings.
(dx, dy): Renamed functions to...
(deltax, deltay): This.
* src/preproc/grn/main.cpp: Some local variable renamings.
(deffont): Add `const'.
(initpic, conv): Use cast for string constant.

* src/preproc/html/pre-html.cpp: Some local variable renamings.
(makeFileName, alterDeviceTo, addZ): Use cast for string constant.
(char_buffer::run_output_filter): Second argument is unused.
* src/preproc/html/pushback.cpp: Some local variable renamings.

* src/preproc/pic/pic.y: Remove redundant declaration of `do_copy'.
* src/preproc/pic/object.cpp: Some local variable renamings.

* src/preproc/refer/label.y (lookup_label): Remove redundant
declaration of local variable.

* src/preproc/soelim.cpp: Remove redundant declaration of
`interpret_lf_args'.

* src/preproc/tbl/main.cpp: Some local variable renamings.

* src/roff/groff/groff.cpp (main): Use cast for string constant.
* src/roff/groff/pipeline.c: Enclose declarations of `error',
`c_fatal', and `i_to_a' with `extern "C"' for C++.
Don't use C++-style comments.

* src/roff/troff/env.h: Remove redundant declaration of `title'.
* src/roff/troff/node.h, src/roff/troff/env.cpp,
src/roff/troff/div.cpp, src/roff/troff/node.cpp: Some local variable
renamings.
* src/roff/troff/div.h: Remove redundant declaration of
`end_diversions'.
* src/roff/troff/troff.h: Remove redundant declaration of
`cleanup_and_exit'
* src/roff/troff/input.cpp: Remove redundant declaration of
`handle_first_page_transition' and `process_input_stack'.

* src/utils/hpftodit.cpp: Some local variable renamings.

* src/utils/indxbib/signal.c: Enclose functions with `extern "C"'
for C++.
Don't define RETSIGTYPE.
* src/utils/indxbib/indxbib.cpp: Some local variable renamings.

* src/utils/pfbtops/pfbtops.cpp: Don't use K&R style.
(error): Use `const' in argument.
(main): Remove redundant declaration of `optind'.
Move declaration of `Version_string' to top-level.

* PROBLEMS: Document difficulties compiling signal.c if a C++
compiler is used for C.



* Makefile.sub (DISTCLEANFILES): Add `test-groff'.

5 files changed, 49 insertions, 51 deletions

diff --git a/src/utils/hpftodit/hpftodit.cpp b/src/utils/hpftodit/hpftodit.cpp
index 718af5aa..3315cf78 100644
--- a/src/utils/hpftodit/hpftodit.cpp
+++ b/src/utils/hpftodit/hpftodit.cpp
@@ -608,11 +608,11 @@ read_symbol_sets(File &f)
 	break;
     if (j < n_symbol_sets) {
       for (int k = 0; k < 256; k++) {
-	uint16 index = symbol_set_table[j].index[k];
-	if (index != NO_GLYPH
-	    && char_table[index].symbol_set == NO_SYMBOL_SET) {
-	  char_table[index].symbol_set = symbol_set_table[j].select;
-	  char_table[index].code = k;
+	uint16 idx = symbol_set_table[j].index[k];
+	if (idx != NO_GLYPH
+	    && char_table[idx].symbol_set == NO_SYMBOL_SET) {
+	  char_table[idx].symbol_set = symbol_set_table[j].select;
+	  char_table[idx].code = k;
 	}
       }
     }
@@ -630,11 +630,11 @@ read_symbol_sets(File &f)
 	break;
     if (j < n_symbol_sets) {
       for (int k = 0; k < 256; k++) {
-	uint16 index = symbol_set_table[j].index[k];
-	if (index != NO_GLYPH
-	    && char_table[index].symbol_set == NO_SYMBOL_SET) {
-	  char_table[index].symbol_set = symbol_set_table[j].select;
-	  char_table[index].code = k;
+	uint16 idx = symbol_set_table[j].index[k];
+	if (idx != NO_GLYPH
+	    && char_table[idx].symbol_set == NO_SYMBOL_SET) {
+	  char_table[idx].symbol_set = symbol_set_table[j].select;
+	  char_table[idx].code = k;
 	}
       }
     }
@@ -1176,9 +1176,9 @@ static void
 dump_symbol_sets(File &f)
 {
   uint32 symbol_set_dir_length = tag_info(symbol_set_tag).count;
-  uint32 n_symbol_sets = symbol_set_dir_length / 14;
+  uint32 num_symbol_sets = symbol_set_dir_length / 14;
 
-  for (uint32 i = 0; i < n_symbol_sets; i++) {
+  for (uint32 i = 0; i < num_symbol_sets; i++) {
     f.seek(tag_info(symbol_set_tag).value + i * 14);
     (void)f.get_uint32();		// offset to symbol set name
     uint32 off1 = f.get_uint32();	// offset to selection string
@@ -1189,7 +1189,7 @@ dump_symbol_sets(File &f)
       if ('0' <= c && c <= '9')
 	putchar(c);
       else if ('A' <= c && c <= 'Z')
-	printf(i < n_symbol_sets - 1 ? "%c," : "%c", c);
+	printf(i < num_symbol_sets - 1 ? "%c," : "%c", c);
     }
   }
 }
diff --git a/src/utils/indxbib/indxbib.cpp b/src/utils/indxbib/indxbib.cpp
index 2a60c156..d8a53b6d 100644
--- a/src/utils/indxbib/indxbib.cpp
+++ b/src/utils/indxbib/indxbib.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-1992, 2000, 2001, 2002, 2003
+/* Copyright (C) 1989-1992, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
   static char stderr_buf[BUFSIZ];
   setbuf(stderr, stderr_buf);
   
-  const char *basename = 0;
+  const char *base_name = 0;
   typedef int (*parser_t)(const char *);
   parser_t parser = do_file;
   const char *directory = 0;
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
       check_integer_arg('n', optarg, 0, &n_ignore_words);
       break;
     case 'o':
-      basename = optarg;
+      base_name = optarg;
       break;
     case 't':
       check_integer_arg('t', optarg, 1, &truncate_len);
@@ -202,33 +202,33 @@ int main(int argc, char **argv)
   store_filename(ignore_fields);
   key_buffer = new char[truncate_len];
   read_common_words_file();
-  if (!basename)
-    basename = optind < argc ? argv[optind] : DEFAULT_INDEX_NAME;
-  const char *p = strrchr(basename, DIR_SEPS[0]), *p1;
+  if (!base_name)
+    base_name = optind < argc ? argv[optind] : DEFAULT_INDEX_NAME;
+  const char *p = strrchr(base_name, DIR_SEPS[0]), *p1;
   const char *sep = &DIR_SEPS[1];
   while (*sep) {
-    p1 = strrchr(basename, *sep);
+    p1 = strrchr(base_name, *sep);
     if (p1 && (!p || p1 > p))
       p = p1;
     sep++;
   }
   size_t name_max;
   if (p) {
-    char *dir = strsave(basename);
-    dir[p - basename] = '\0';
+    char *dir = strsave(base_name);
+    dir[p - base_name] = '\0';
     name_max = file_name_max(dir);
     a_delete dir;
   }
   else
     name_max = file_name_max(".");
-  const char *filename = p ? p + 1 : basename;
+  const char *filename = p ? p + 1 : base_name;
   if (strlen(filename) + sizeof(INDEX_SUFFIX) - 1 > name_max)
     fatal("`%1.%2' is too long for a filename", filename, INDEX_SUFFIX);
   if (p) {
     p++;
-    temp_index_file = new char[p - basename + sizeof(TEMP_INDEX_TEMPLATE)];
-    memcpy(temp_index_file, basename, p - basename);
-    strcpy(temp_index_file + (p - basename), TEMP_INDEX_TEMPLATE);
+    temp_index_file = new char[p - base_name + sizeof(TEMP_INDEX_TEMPLATE)];
+    memcpy(temp_index_file, base_name, p - base_name);
+    strcpy(temp_index_file + (p - base_name), TEMP_INDEX_TEMPLATE);
   }
   else {
     temp_index_file = strsave(TEMP_INDEX_TEMPLATE);
@@ -281,8 +281,8 @@ int main(int argc, char **argv)
   write_hash_table();
   if (fclose(indxfp) < 0)
     fatal("error closing temporary index file: %1", strerror(errno));
-  char *index_file = new char[strlen(basename) + sizeof(INDEX_SUFFIX)];    
-  strcpy(index_file, basename);
+  char *index_file = new char[strlen(base_name) + sizeof(INDEX_SUFFIX)];    
+  strcpy(index_file, base_name);
   strcat(index_file, INDEX_SUFFIX);
 #ifdef HAVE_RENAME
 #ifdef __EMX__
@@ -293,7 +293,7 @@ int main(int argc, char **argv)
 #ifdef __MSDOS__
     // RENAME could fail on plain MSDOS filesystems because
     // INDEX_FILE is an invalid filename, e.g. it has multiple dots.
-    char *fname = p ? index_file + (p - basename) : 0;
+    char *fname = p ? index_file + (p - base_name) : 0;
     char *dot = 0;
 
     // Replace the dot with an underscore and try again.
diff --git a/src/utils/indxbib/signal.c b/src/utils/indxbib/signal.c
index 2f7886ad..a8ab257f 100644
--- a/src/utils/indxbib/signal.c
+++ b/src/utils/indxbib/signal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 2001, 2003, 2004 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -30,14 +30,13 @@ that is correct for C++, so we implement all signal handling in C. */
 #include <unistd.h>
 #endif
 
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-extern void cleanup();
+extern void cleanup(void);
 
-static RETSIGTYPE handle_fatal_signal(signum)
-     int signum;
+static RETSIGTYPE handle_fatal_signal(int signum)
 {
   signal(signum, SIG_DFL);
   cleanup();
@@ -50,7 +49,7 @@ static RETSIGTYPE handle_fatal_signal(signum)
 #endif
 }
 
-void catch_fatal_signals()
+void catch_fatal_signals(void)
 {
 #ifdef SIGHUP
   signal(SIGHUP, handle_fatal_signal);
@@ -59,6 +58,10 @@ void catch_fatal_signals()
   signal(SIGTERM, handle_fatal_signal);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #ifndef HAVE_RENAME
 
 void ignore_fatal_signals()
diff --git a/src/utils/pfbtops/pfbtops.c b/src/utils/pfbtops/pfbtops.c
index 094d9ddf..72a100e5 100644
--- a/src/utils/pfbtops/pfbtops.c
+++ b/src/utils/pfbtops/pfbtops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 2001, 2003, 2004 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -35,10 +35,11 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #define MAX_LINE_LENGTH 78
 #define HEX_DIGITS "0123456789abcdef"
 
+extern const char *Version_string;
+
 static char *program_name;
 
-static void error(s)
-     char *s;
+static void error(const char *s)
 {
   fprintf(stderr, "%s: %s\n", program_name, s);
   exit(2);
@@ -160,12 +161,9 @@ static void get_binary(int n)
   putchar('\n');
 }
 
-int main(argc, argv)
-     int argc;
-     char **argv;
+int main(int argc, char **argv)
 {
   int opt;
-  extern int optind;
   static const struct option long_options[] = {
     { "help", no_argument, 0, CHAR_MAX + 1 },
     { "version", no_argument, 0, 'v' },
@@ -177,12 +175,9 @@ int main(argc, argv)
   while ((opt = getopt_long(argc, argv, "v", long_options, NULL)) != EOF) {
     switch (opt) {
     case 'v':
-      {
-	extern const char *Version_string;
-	printf("GNU pfbtops (groff) version %s\n", Version_string);
-	exit(0);
-	break;
-      }
+      printf("GNU pfbtops (groff) version %s\n", Version_string);
+      exit(0);
+      break;
     case CHAR_MAX + 1: /* --help */
       usage(stdout);
       exit(0);
diff --git a/src/utils/tfmtodit/tfmtodit.cpp b/src/utils/tfmtodit/tfmtodit.cpp
index 9fbbe25f..1c1ba914 100644
--- a/src/utils/tfmtodit/tfmtodit.cpp
+++ b/src/utils/tfmtodit/tfmtodit.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001, 2004 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -670,7 +670,7 @@ enum { CH_f, CH_i, CH_l, CH_ff, CH_fi, CH_fl, CH_ffi, CH_ffl };
 
 // Each possible ligature appears in this table.
 
-struct {
+struct S {
   unsigned char c1, c2, res;
   const char *ch;
 } lig_table[] = {