* src/preproc/html/pre-html.cc (scanArguments): Use `troff_command'

instead of hardwired `"troff"'.
(char_buffer::read_file): Remove unused variables.
(char_buffer::write_file_troff): Ditto.
(char_buffer::write_file_html): Ditto.
(generateImages): Ditto.
(abs): Removed.
* src/utils/addftinfo/addftinfo.cc (main): Fix compilation problem.

* src/include/lib.h: Don't include `groff-getopt.h' for UWIN.

* src/libs/libgroff/font.cc (font::load_desc): Fix compiler warning.
* src/libs/libbib/index.cc (index_search_item_iterator::get_tag,
index_search_item::search1): Ditto.
* src/roff/troff/node.h (width_list): Reorder members.
* src/roff/troff/input.cc (do_define_macro): Fix compiler warning.
(lookup_warning): Ditto.
(prepend_string): Commented out.
* src/roff/troff/dictionary.cc (is_good_size): Fix compiler warning.
* src/roff/troff/reg.cc (number_value_to_ascii): Ditto.
* src/preproc/tbl/main.cc (process_format): Ditto.
* src/preproc/pic/pic.y (define_variable, reset, reset_all): Fix
compiler warnings.
* src/preproc/pic/pic.cc: Updated.
* src/preproc/eqn/lex.cc (init_table): Fix compiler warnings.
* src/preproc/eqn/over.cc (over_box::compute_metrics): Ditto.
* src/preproc/refer/command.cc (execute_command): Ditto.
* src/preproc/refer/ref.cc (sortify_title, find_month): Ditto.
* src/preproc/refer/token.cc (lookup_token): Ditto.
* src/preproc/soelim/soelim.cc: Ditto.
* src/preproc/html/pushbackbuffer.cc (ERROR): Ditto.
(isHexDigit): Commented out.
(pushBackBuffer::isString): Remove unused variable.
* src/devices/grops/ps.cc (ps_printer::special): Fix compiler
warning.
* src/devices/grops/psrm.cc (resource_manager::lookup_font,
resource_manager::read_resource_arg, read_one_of, parse_extensions):
Ditto.
* src/devices/grodvi/dvi.cc (dvi_printer::draw): Ditto.
* src/devices/grolj4/lj4.cc (lj4_font::handle_unknown_font_command,
lookup_paper_size): Ditto.
* src/devices/grohtml/post-html.cc (is_subsection): Commented out.
(text_glob, element_list): Reorder members.
* src/devices/grohtml/html-text.cc (html_text::do_pre): Remove
compiler warning.
* src/devices/grohtml/html-text.h (html_text::emit_space): Change
return value to `void'.
* src/devices/grohtml/output.cc (word_list::word_list): Fix order
of initializers.
* src/devices/grohtml/html.h (simple_output::check_newline,
simple_output::space_or_newline, simple_output::enable_newlines):
Add return value.
* src/devices/grolbp/lbp.cc (wp54charset, set_papersize): Remove
compiler warnings.
* src/utils/tfmtodit/tfmtodit.cc (tfm::load, gf::load, main): Ditto.
* src/utils/hpftodit/hpftodit.cc (File::seek, read_symbol_sets,
output_ligatures, output_charset, read_map): Ditto.
* src/utils/lookbib/lookbib.cc (main): Ditto.
* src/utils/indxbib/indxbib.cc (main, fwrite_or_die): Ditto.
(do_file): Fix typo (`=' -> `==').
* src/utils/lkbib/lkbib.cc (main): Remove compiler warning.
* src/utils/addftinfo/addftinfo.cc (main): Ditto.

11 files changed, 42 insertions, 50 deletions

diff --git a/src/preproc/eqn/lex.cc b/src/preproc/eqn/lex.cc
index 25faec2b..e14053d1 100644
--- a/src/preproc/eqn/lex.cc
+++ b/src/preproc/eqn/lex.cc
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -251,7 +252,7 @@ static struct {
 
 void init_table(const char *device)
 {
-  int i;
+  unsigned int i;
   for (i = 0; i < sizeof(token_table)/sizeof(token_table[0]); i++) {
     definition *def = new definition;
     def->is_macro = 0;
diff --git a/src/preproc/eqn/over.cc b/src/preproc/eqn/over.cc
index 06b03212..4c544d1b 100644
--- a/src/preproc/eqn/over.cc
+++ b/src/preproc/eqn/over.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -65,7 +65,7 @@ int over_box::compute_metrics(int style)
     set_script_size();
     printf(".nr " SMALL_SIZE_FORMAT " \\n[.s]\n", uid);
   }
-  int mark_uid;
+  int mark_uid = 0;
   int res = num->compute_metrics(style);
   if (res)
     mark_uid = num->uid;
diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc
index 8357dd6e..c87612ef 100644
--- a/src/preproc/html/pre-html.cc
+++ b/src/preproc/html/pre-html.cc
@@ -187,8 +187,6 @@ char_buffer::~char_buffer()
 
 int char_buffer::read_file (FILE *fp)
 {
-  int i=0;
-  unsigned int old_used;
   int n;
 
   while (! feof(fp)) {
@@ -456,7 +454,6 @@ void char_buffer::skip_to_newline (char_block **t, int *i)
 void char_buffer::write_file_troff (void)
 {
   char_block *t=head;
-  int r;
   int         i=0;
 
   if (t != 0) {
@@ -613,19 +610,6 @@ static void removeAllPages (void)
 }
 
 /*
- *  abs - returns the absolute value.
- */
-
-int abs (int x)
-{
-  if (x < 0) {
-    return( -x );
-  } else {
-    return( x );
-  }
-}
-
-/*
  *  min - returns the minimum of two numbers.
  */
 
@@ -712,7 +696,6 @@ static imageList listOfImages;  // list of images defined by the region file.
 void char_buffer::write_file_html (void)
 {
   char_block *t      =head;
-  char       *name;
   int         i=0;
 
   if (t != 0) {
@@ -760,7 +743,6 @@ void char_buffer::write_file_html (void)
 static void generateImages (char *regionFileName)
 {
   pushBackBuffer *f=new pushBackBuffer(regionFileName);
-  char ch;
 
   while (f->putPB(f->getPB()) != eof) {
     if (f->isString("grohtml-info:page")) {
@@ -775,10 +757,10 @@ static void generateImages (char *regionFileName)
       listOfImages.add(x1, y1, x2, y2, page, res, maxx, name);
       while ((f->putPB(f->getPB()) != '\n') &&
 	     (f->putPB(f->getPB()) != eof)) {
-	ch = f->getPB();
+	(void)f->getPB();
       }
       if (f->putPB(f->getPB()) == '\n') {
-	ch = f->getPB();
+	(void)f->getPB();
       }
     } else {
       /*
@@ -1034,7 +1016,7 @@ int scanArguments (int argc, char **argv)
 	       || (strcmp(argv[i], "-?") == 0)) {
       usage(stdout);
       exit(0);
-    } else if (strcmp(argv[i], "troff") == 0) {
+    } else if (strcmp(argv[i], troff_command) == 0) {
       /* remember troff argument number */
       troff_arg = i;
 #if defined(DEBUGGING)
diff --git a/src/preproc/html/pushbackbuffer.cc b/src/preproc/html/pushbackbuffer.cc
index 1d380f4d..4bea4516 100755
--- a/src/preproc/html/pushbackbuffer.cc
+++ b/src/preproc/html/pushbackbuffer.cc
@@ -48,7 +48,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #   define FALSE (1==0)
 #endif
 
-#   define ERROR(X)         (fprintf(stderr, "%s:%d error %s\n", __FILE__, __LINE__, X) && \
+#   define ERROR(X)   (void)(fprintf(stderr, "%s:%d error %s\n", __FILE__, __LINE__, X) && \
                             (fflush(stderr)) && localexit(1))
 
 
@@ -195,7 +195,6 @@ int pushBackBuffer::isString (char *s)
 {
   int length=strlen(s);
   int i=0;
-  int j;
 
   while ((i<length) && (putPB(getPB())==s[i])) {
     if (getPB() != s[i]) {
@@ -230,10 +229,12 @@ static int isDigit (char ch)
  *  isHexDigit - returns TRUE if the character, ch, is a hex digit.
  */
 
+#if 0
 static int isHexDigit (char ch)
 {
   return( (isDigit(ch)) || ((ch>='a') && (ch<='f')) );
 }
+#endif
 
 /*
  *  readInt - returns an integer from the input stream.
diff --git a/src/preproc/pic/pic.cc b/src/preproc/pic/pic.cc
index f6d97bb2..6e6c5270 100755
--- a/src/preproc/pic/pic.cc
+++ b/src/preproc/pic/pic.cc
@@ -1,6 +1,6 @@
 #ifndef lint
 /*static char yysccsid[] = "from: @(#)yaccpar	1.9 (Berkeley) 02/21/93";*/
-static char yyrcsid[] = "$Id: pic.cc,v 1.3 2000/11/14 20:40:28 wlemb Exp $";
+static char yyrcsid[] = "$Id: pic.cc,v 1.4 2001/04/19 14:01:55 wlemb Exp $";
 #endif
 #define YYBYACC 1
 #define YYMAJOR 1
@@ -3217,7 +3217,8 @@ void define_variable(const char *name, double val)
   if (strcmp(name, "scale") == 0) {
     // When the scale changes, reset all scaled pre-defined variables to
     // their default values.
-    for (int i = 0; i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) 
+    for (unsigned int i = 0;
+	 i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) 
       if (defaults_table[i].scaled)
 	define_variable(defaults_table[i].name, val*defaults_table[i].val);
   }
@@ -3236,7 +3237,8 @@ void parse_init()
 
 void reset(const char *nm)
 {
-  for (int i = 0; i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
+  for (unsigned int i = 0;
+       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
     if (strcmp(nm, defaults_table[i].name) == 0) {
       double val = defaults_table[i].val;
       if (defaults_table[i].scaled) {
@@ -3256,7 +3258,8 @@ void reset_all()
   // aren't scaled because `scale' is not scaled, and changing the
   // value of `scale' will reset all the pre-defined variables that
   // are scaled.
-  for (int i = 0; i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
+  for (unsigned int i = 0;
+       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
     if (!defaults_table[i].scaled)
       define_variable(defaults_table[i].name, defaults_table[i].val);
 }
diff --git a/src/preproc/pic/pic.y b/src/preproc/pic/pic.y
index 38b960a6..c0a7315f 100644
--- a/src/preproc/pic/pic.y
+++ b/src/preproc/pic/pic.y
@@ -1,4 +1,5 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -1622,7 +1623,8 @@ void define_variable(const char *name, double val)
   if (strcmp(name, "scale") == 0) {
     // When the scale changes, reset all scaled pre-defined variables to
     // their default values.
-    for (int i = 0; i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) 
+    for (unsigned int i = 0;
+	 i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) 
       if (defaults_table[i].scaled)
 	define_variable(defaults_table[i].name, val*defaults_table[i].val);
   }
@@ -1641,7 +1643,8 @@ void parse_init()
 
 void reset(const char *nm)
 {
-  for (int i = 0; i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
+  for (unsigned int i = 0;
+       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
     if (strcmp(nm, defaults_table[i].name) == 0) {
       double val = defaults_table[i].val;
       if (defaults_table[i].scaled) {
@@ -1661,7 +1664,8 @@ void reset_all()
   // aren't scaled because `scale' is not scaled, and changing the
   // value of `scale' will reset all the pre-defined variables that
   // are scaled.
-  for (int i = 0; i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
+  for (unsigned int i = 0;
+       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
     if (!defaults_table[i].scaled)
       define_variable(defaults_table[i].name, defaults_table[i].val);
 }
diff --git a/src/preproc/refer/command.cc b/src/preproc/refer/command.cc
index 004189ee..bf88c89d 100644
--- a/src/preproc/refer/command.cc
+++ b/src/preproc/refer/command.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -755,7 +755,8 @@ static int check_args(const char *types, const char *name,
 
 static void execute_command(const char *name, int argc, argument *argv)
 {
-  for (int i = 0; i < sizeof(command_table)/sizeof(command_table[0]); i++)
+  for (unsigned int i = 0;
+       i < sizeof(command_table)/sizeof(command_table[0]); i++)
     if (strcmp(name, command_table[i].name) == 0) {
       if (check_args(command_table[i].arg_types, name, argc, argv))
 	(*command_table[i].func)(argc, argv);
diff --git a/src/preproc/refer/ref.cc b/src/preproc/refer/ref.cc
index c3517b19..9c040789 100644
--- a/src/preproc/refer/ref.cc
+++ b/src/preproc/refer/ref.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
 Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -327,13 +327,13 @@ void sortify_title(const char *s, int len, string &key)
       break;
   }
   if (ptr < end) {
-    int first_word_len = ptr - s - 1;
+    unsigned int first_word_len = ptr - s - 1;
     const char *ae = articles.contents() + articles.length();
     for (const char *a = articles.contents();
 	 a < ae;
 	 a = strchr(a, '\0') + 1)
       if (first_word_len == strlen(a)) {
-	int j;
+	unsigned int j;
 	for (j = 0; j < first_word_len; j++)
 	  if (a[j] != cmlower(s[j]))
 	    break;
@@ -951,7 +951,7 @@ static int find_month(const char *start, const char *end)
     while (ptr < end && csalpha(*ptr))
       ptr++;
     if (ptr - start >= 3) {
-      for (int i = 0; i < sizeof(months)/sizeof(months[0]); i++) {
+      for (unsigned int i = 0; i < sizeof(months)/sizeof(months[0]); i++) {
 	const char *q = months[i];
 	const char *p = start;
 	for (; p < ptr; p++, q++)
diff --git a/src/preproc/refer/token.cc b/src/preproc/refer/token.cc
index 1cf6890f..e9fac5df 100644
--- a/src/preproc/refer/token.cc
+++ b/src/preproc/refer/token.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -181,7 +181,7 @@ const token_info *lookup_token(const char *start, const char *end)
   for (;;) {
     if (token_table[n].tok == 0)
       break;
-    if (strlen(token_table[n].tok) == end - start
+    if (strlen(token_table[n].tok) == size_t(end - start)
 	&& memcmp(token_table[n].tok, start, end - start) == 0)
       return &(token_table[n].ti);
     if (n == 0)
diff --git a/src/preproc/soelim/soelim.cc b/src/preproc/soelim/soelim.cc
index e05f2406..90b8d1c7 100644
--- a/src/preproc/soelim/soelim.cc
+++ b/src/preproc/soelim/soelim.cc
@@ -30,7 +30,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include "stringclass.h"
 #include "nonposix.h"
 
-static int include_list_length;
+static size_t include_list_length;
 static char **include_list;
 
 int compatible_flag = 0;
@@ -183,18 +183,18 @@ int do_file(const char *filename)
     {
       char *path = include_list[j];
       if (0 == strcmp(path, "."))
-      	whole_filename = filename;
+	whole_filename = filename;
       else
-        whole_filename = string(path) + "/" + filename;
+	whole_filename = string(path) + "/" + filename;
       whole_filename += '\0';
       errno = 0;
       fp = fopen(whole_filename.contents(), "r");
       if (fp != 0)
-      	break;
+	break;
       if (errno != ENOENT) {
-        error("can't open `%1': %2",
+	error("can't open `%1': %2",
 	      whole_filename.contents(), strerror(errno));
-        return 0;
+	return 0;
       }
     }
     if (j >= include_list_length)
diff --git a/src/preproc/tbl/main.cc b/src/preproc/tbl/main.cc
index a08ea0be..4031f434 100644
--- a/src/preproc/tbl/main.cc
+++ b/src/preproc/tbl/main.cc
@@ -731,7 +731,7 @@ format *process_format(table_input &in, options *opt,
     int pre_vline = 0;
     int got_format = 0;
     int got_period = 0;
-    format_type t;
+    format_type t = FORMAT_LEFT;
     for (;;) {
       if (c == EOF) {
 	error("end of input while processing format");